update to trunk r14104

blenderbuttons is good
and it compiles

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 933203a459e5fdc89f3e67e4dd278128d018857c..a758c2a09d4351787929f2bc1aab3e11503af96c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -145,7 +145,6 @@ IF(UNIX)
     /opt/local/include/freetype2
     /opt/csw/include/freetype2
     /opt/include/freetype2
-    NO_DEFAULT_PATH
   )
   SET(FREETYPE_LIB freetype)
 

diff --git a/bin/.blender/.Blanguages b/bin/.blender/.Blanguages
index acd5756ad387cd793f9aa5f18fa2f91e475b3112..7b59bfcd3f05c7375c30a74a41d5597285406695 100644 (file)
--- a/bin/.blender/.Blanguages
+++ b/bin/.blender/.Blanguages
@@ -9,7 +9,7 @@ French:fr_FR
 Spanish:es_ES
 Catalan:ca_ES
 Czech:cs_CZ
-Brazilian Portuguese:pt_BR
+Brazilian Portuguese:pt_br
 Simplified Chinese:zh_CN
 Russian:ru_RU
 Croatian:hr_HR

diff --git a/config/darwin-config.py b/config/darwin-config.py
index 5a2fc93c52d0b07189f84544b43c71dfadc4d690..e53050645cec08c3c7190c3b1f4c50378e186c2d 100644 (file)
--- a/config/darwin-config.py
+++ b/config/darwin-config.py
@@ -1,12 +1,12 @@
-LCGDIR = '#../lib/darwin-6.1-powerpc'
+LCGDIR = '#../../trunk/lib/darwin-6.1-powerpc'
 LIBDIR = '${LCGDIR}'
 
 # enable ffmpeg  support
 WITH_BF_FFMPEG = 'true'  # -DWITH_FFMPEG
 BF_FFMPEG = LIBDIR +'/ffmpeg'
-BF_FFMPEG_INC = '${BF_FFMPEG}/include'
-BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB = 'avformat.a avcodec.a avutil.a'
+BF_FFMPEG_INC = '#extern/ffmpeg/include'
+#BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
+#BF_FFMPEG_LIB = 'avformat.a avcodec.a avutil.a'
 
 WITH_BF_VERSE = 'false'
 BF_VERSE = "#extern/verse/dist"
@@ -15,16 +15,17 @@ BF_VERSE_INCLUDE = BF_VERSE
 BF_VERSE_LIBS = "libverse"
 
 # python.org libs install in /library 
-BF_PYTHON_VERSION = '2.3'
+BF_PYTHON_VERSION = '2.5'
 if BF_PYTHON_VERSION=='2.3':
        BF_PYTHON = '/System/Library/Frameworks/Python.framework/Versions/'
 else:
-       BF_PYTHON = '/Library/Frameworks/Python.framework/Versions/'
+       BF_PYTHON = '/Library/Frameworks/Python.framework'
 
-BF_PYTHON_INC = '${BF_PYTHON}${BF_PYTHON_VERSION}/include/python${BF_PYTHON_VERSION}'
-BF_PYTHON_BINARY = '${BF_PYTHON}${BF_PYTHON_VERSION}/bin/python${BF_PYTHON_VERSION}'
+BF_PYTHON_INC = '${BF_PYTHON}/Headers'
+BF_PYTHON_BINARY = '${BF_PYTHON}/python'
 BF_PYTHON_LIB = ''
-BF_PYTHON_LIBPATH = '${BF_PYTHON}${BF_PYTHON_VERSION}/lib/python${BF_PYTHON_VERSION}/config'
+BF_PYTHON_LIBPATH = '${BF_PYTHON}/Versions/${BF_PYTHON_VERSION}/lib/python${BF_PYTHON_VERSION}/config'
+#BF_PYTHON_LIBPATH = '${BF_PYTHON}${BF_PYTHON_VERSION}/lib/python${BF_PYTHON_VERSION}/config'
 BF_PYTHON_LINKFLAGS = '-u __dummy -u _PyMac_Error -framework System -framework Python'
 
 WITH_BF_OPENAL = 'true'
@@ -32,7 +33,7 @@ WITH_BF_OPENAL = 'true'
 # for gcc 3.3
 #BF_OPENAL = LIBDIR + '/openal'
 # for gcc 3.4
-BF_OPENAL = '#../lib/darwin-8.0.0-powerpc/openal'
+BF_OPENAL = '#../../trunk/lib/darwin-8.0.0-powerpc/openal'
 
 BF_OPENAL_INC = '${BF_OPENAL}/include'
 BF_OPENAL_LIB = 'openal'
@@ -88,7 +89,7 @@ BF_FTGL_INC = '${BF_FTGL}/include'
 BF_FTGL_LIB = 'extern_ftgl'
 
 WITH_BF_GAMEENGINE='true'
-WITH_BF_PLAYER='true'
+WITH_BF_PLAYER='false'
 
 WITH_BF_ODE = 'false'
 BF_ODE = LIBDIR + '/ode'

diff --git a/extern/bFTGL/README.txt b/extern/bFTGL/README.txt
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/include/FTBBox.h b/extern/bFTGL/include/FTBBox.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/include/FTBitmapGlyph.h b/extern/bFTGL/include/FTBitmapGlyph.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/include/FTBufferGlyph.h b/extern/bFTGL/include/FTBufferGlyph.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/include/FTFace.h b/extern/bFTGL/include/FTFace.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/include/FTFont.h b/extern/bFTGL/include/FTFont.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/include/FTGLBitmapFont.h b/extern/bFTGL/include/FTGLBitmapFont.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/include/FTGLBufferFont.h b/extern/bFTGL/include/FTGLBufferFont.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/include/FTGLOutlineFont.h b/extern/bFTGL/include/FTGLOutlineFont.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/include/FTGLPixmapFont.h b/extern/bFTGL/include/FTGLPixmapFont.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/include/FTGLPolygonFont.h b/extern/bFTGL/include/FTGLPolygonFont.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/include/FTGLTextureFont.h b/extern/bFTGL/include/FTGLTextureFont.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/include/FTGlyph.h b/extern/bFTGL/include/FTGlyph.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/include/FTGlyphContainer.h b/extern/bFTGL/include/FTGlyphContainer.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/include/FTLibrary.h b/extern/bFTGL/include/FTLibrary.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/include/FTPixmapGlyph.h b/extern/bFTGL/include/FTPixmapGlyph.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/include/FTPoint.h b/extern/bFTGL/include/FTPoint.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/include/FTSize.h b/extern/bFTGL/include/FTSize.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/include/FTTextureGlyph.h b/extern/bFTGL/include/FTTextureGlyph.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/src/FTBitmapGlyph.cpp b/extern/bFTGL/src/FTBitmapGlyph.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/src/FTBufferGlyph.cpp b/extern/bFTGL/src/FTBufferGlyph.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/src/FTFace.cpp b/extern/bFTGL/src/FTFace.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/src/FTFont.cpp b/extern/bFTGL/src/FTFont.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/src/FTGLBitmapFont.cpp b/extern/bFTGL/src/FTGLBitmapFont.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/src/FTGLBufferFont.cpp b/extern/bFTGL/src/FTGLBufferFont.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/src/FTGLOutlineFont.cpp b/extern/bFTGL/src/FTGLOutlineFont.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/src/FTGLPixmapFont.cpp b/extern/bFTGL/src/FTGLPixmapFont.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/src/FTGLPolygonFont.cpp b/extern/bFTGL/src/FTGLPolygonFont.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/src/FTGLTextureFont.cpp b/extern/bFTGL/src/FTGLTextureFont.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/src/FTGlyph.cpp b/extern/bFTGL/src/FTGlyph.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/src/FTGlyphContainer.cpp b/extern/bFTGL/src/FTGlyphContainer.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/src/FTLibrary.cpp b/extern/bFTGL/src/FTLibrary.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/src/FTPixmapGlyph.cpp b/extern/bFTGL/src/FTPixmapGlyph.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/src/FTPoint.cpp b/extern/bFTGL/src/FTPoint.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/src/FTSize.cpp b/extern/bFTGL/src/FTSize.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/bFTGL/src/FTTextureGlyph.cpp b/extern/bFTGL/src/FTTextureGlyph.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/COPYING.txt b/extern/qhull/COPYING.txt
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/README.txt b/extern/qhull/README.txt
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/REGISTER.txt b/extern/qhull/REGISTER.txt
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/VisualC6/qhull.dsw b/extern/qhull/VisualC6/qhull.dsw
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/VisualC6/qhull/qhull.dsp b/extern/qhull/VisualC6/qhull/qhull.dsp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/include/qhull/geom.h b/extern/qhull/include/qhull/geom.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/include/qhull/io.h b/extern/qhull/include/qhull/io.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/include/qhull/mem.h b/extern/qhull/include/qhull/mem.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/include/qhull/merge.h b/extern/qhull/include/qhull/merge.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/include/qhull/poly.h b/extern/qhull/include/qhull/poly.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/include/qhull/qhull.h b/extern/qhull/include/qhull/qhull.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/include/qhull/qhull_a.h b/extern/qhull/include/qhull/qhull_a.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/include/qhull/qset.h b/extern/qhull/include/qhull/qset.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/include/qhull/stat.h b/extern/qhull/include/qhull/stat.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/include/qhull/user.h b/extern/qhull/include/qhull/user.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/Makefile.txt b/extern/qhull/src/Makefile.txt
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/geom.c b/extern/qhull/src/geom.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/geom.h b/extern/qhull/src/geom.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/geom2.c b/extern/qhull/src/geom2.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/global.c b/extern/qhull/src/global.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/io.c b/extern/qhull/src/io.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/io.h b/extern/qhull/src/io.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/mem.c b/extern/qhull/src/mem.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/mem.h b/extern/qhull/src/mem.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/merge.c b/extern/qhull/src/merge.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/merge.h b/extern/qhull/src/merge.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/poly.c b/extern/qhull/src/poly.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/poly.h b/extern/qhull/src/poly.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/poly2.c b/extern/qhull/src/poly2.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/qconvex.c b/extern/qhull/src/qconvex.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/qdelaun.c b/extern/qhull/src/qdelaun.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/qhalf.c b/extern/qhull/src/qhalf.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/qhull.c b/extern/qhull/src/qhull.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/qhull.h b/extern/qhull/src/qhull.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/qhull_a.h b/extern/qhull/src/qhull_a.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/qhull_interface.cpp b/extern/qhull/src/qhull_interface.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/qset.c b/extern/qhull/src/qset.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/qset.h b/extern/qhull/src/qset.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/qvoronoi.c b/extern/qhull/src/qvoronoi.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/rbox.c b/extern/qhull/src/rbox.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/stat.c b/extern/qhull/src/stat.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/stat.h b/extern/qhull/src/stat.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/unix.c b/extern/qhull/src/unix.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/user.c b/extern/qhull/src/user.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/user.h b/extern/qhull/src/user.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/user_eg.c b/extern/qhull/src/user_eg.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/qhull/src/user_eg2.c b/extern/qhull/src/user_eg2.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/LICENSE_GPL.txt b/extern/solid/LICENSE_GPL.txt
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/LICENSE_QPL.txt b/extern/solid/LICENSE_QPL.txt
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/Makefile b/extern/solid/Makefile
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/README.txt b/extern/solid/README.txt
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/VisualC6/broad/broad.dsp b/extern/solid/VisualC6/broad/broad.dsp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/VisualC6/complex/complex.dsp b/extern/solid/VisualC6/complex/complex.dsp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/VisualC6/convex/convex.dsp b/extern/solid/VisualC6/convex/convex.dsp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/VisualC6/dynamics/dynamics.dsp b/extern/solid/VisualC6/dynamics/dynamics.dsp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/VisualC6/gldemo/gldemo.dsp b/extern/solid/VisualC6/gldemo/gldemo.dsp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/VisualC6/mnm/mnm.dsp b/extern/solid/VisualC6/mnm/mnm.dsp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/VisualC6/physics/physics.dsp b/extern/solid/VisualC6/physics/physics.dsp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/VisualC6/sample/sample.dsp b/extern/solid/VisualC6/sample/sample.dsp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/VisualC6/solid.dsw b/extern/solid/VisualC6/solid.dsw
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/VisualC6/solid/solid.dsp b/extern/solid/VisualC6/solid/solid.dsp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/VisualC6/solid_dll/solid_dll.dsp b/extern/solid/VisualC6/solid_dll/solid_dll.dsp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/include/GEN_MinMax.h b/extern/solid/include/GEN_MinMax.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/include/GEN_random.h b/extern/solid/include/GEN_random.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/include/MT/Interval.h b/extern/solid/include/MT/Interval.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/include/MT/Matrix3x3.h b/extern/solid/include/MT/Matrix3x3.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/include/MT/Quaternion.h b/extern/solid/include/MT/Quaternion.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/include/MT/Transform.h b/extern/solid/include/MT/Transform.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/include/MT/Tuple3.h b/extern/solid/include/MT/Tuple3.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/include/MT/Tuple4.h b/extern/solid/include/MT/Tuple4.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/include/MT/Vector3.h b/extern/solid/include/MT/Vector3.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/include/MT_BBox.h b/extern/solid/include/MT_BBox.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/include/MT_Interval.h b/extern/solid/include/MT_Interval.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/include/MT_Matrix3x3.h b/extern/solid/include/MT_Matrix3x3.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/include/MT_Point3.h b/extern/solid/include/MT_Point3.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/include/MT_Quaternion.h b/extern/solid/include/MT_Quaternion.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/include/MT_Scalar.h b/extern/solid/include/MT_Scalar.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/include/MT_Transform.h b/extern/solid/include/MT_Transform.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/include/MT_Vector3.h b/extern/solid/include/MT_Vector3.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/include/SOLID.h b/extern/solid/include/SOLID.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/include/SOLID_broad.h b/extern/solid/include/SOLID_broad.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/include/SOLID_types.h b/extern/solid/include/SOLID_types.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/DT_AlgoTable.h b/extern/solid/src/DT_AlgoTable.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/DT_C-api.cpp b/extern/solid/src/DT_C-api.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/DT_Encounter.cpp b/extern/solid/src/DT_Encounter.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/DT_Encounter.h b/extern/solid/src/DT_Encounter.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/DT_Object.cpp b/extern/solid/src/DT_Object.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/DT_Object.h b/extern/solid/src/DT_Object.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/DT_RespTable.cpp b/extern/solid/src/DT_RespTable.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/DT_RespTable.h b/extern/solid/src/DT_RespTable.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/DT_Response.h b/extern/solid/src/DT_Response.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/DT_Scene.cpp b/extern/solid/src/DT_Scene.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/DT_Scene.h b/extern/solid/src/DT_Scene.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/broad/BP_C-api.cpp b/extern/solid/src/broad/BP_C-api.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/broad/BP_Endpoint.h b/extern/solid/src/broad/BP_Endpoint.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/broad/BP_EndpointList.cpp b/extern/solid/src/broad/BP_EndpointList.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/broad/BP_EndpointList.h b/extern/solid/src/broad/BP_EndpointList.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/broad/BP_Proxy.cpp b/extern/solid/src/broad/BP_Proxy.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/broad/BP_Proxy.h b/extern/solid/src/broad/BP_Proxy.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/broad/BP_ProxyList.h b/extern/solid/src/broad/BP_ProxyList.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/broad/BP_Scene.cpp b/extern/solid/src/broad/BP_Scene.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/broad/BP_Scene.h b/extern/solid/src/broad/BP_Scene.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/complex/DT_BBoxTree.cpp b/extern/solid/src/complex/DT_BBoxTree.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/complex/DT_BBoxTree.h b/extern/solid/src/complex/DT_BBoxTree.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/complex/DT_CBox.h b/extern/solid/src/complex/DT_CBox.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/complex/DT_Complex.cpp b/extern/solid/src/complex/DT_Complex.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/complex/DT_Complex.h b/extern/solid/src/complex/DT_Complex.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_Accuracy.cpp b/extern/solid/src/convex/DT_Accuracy.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_Accuracy.h b/extern/solid/src/convex/DT_Accuracy.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_Array.h b/extern/solid/src/convex/DT_Array.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_Box.cpp b/extern/solid/src/convex/DT_Box.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_Box.h b/extern/solid/src/convex/DT_Box.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_Cone.cpp b/extern/solid/src/convex/DT_Cone.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_Cone.h b/extern/solid/src/convex/DT_Cone.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_Convex.cpp b/extern/solid/src/convex/DT_Convex.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_Convex.h b/extern/solid/src/convex/DT_Convex.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_Cylinder.cpp b/extern/solid/src/convex/DT_Cylinder.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_Cylinder.h b/extern/solid/src/convex/DT_Cylinder.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_Facet.cpp b/extern/solid/src/convex/DT_Facet.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_Facet.h b/extern/solid/src/convex/DT_Facet.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_GJK.h b/extern/solid/src/convex/DT_GJK.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_Hull.h b/extern/solid/src/convex/DT_Hull.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_IndexArray.h b/extern/solid/src/convex/DT_IndexArray.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_LineSegment.cpp b/extern/solid/src/convex/DT_LineSegment.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_LineSegment.h b/extern/solid/src/convex/DT_LineSegment.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_Minkowski.h b/extern/solid/src/convex/DT_Minkowski.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_PenDepth.cpp b/extern/solid/src/convex/DT_PenDepth.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_PenDepth.h b/extern/solid/src/convex/DT_PenDepth.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_Point.cpp b/extern/solid/src/convex/DT_Point.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_Point.h b/extern/solid/src/convex/DT_Point.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_Polyhedron.cpp b/extern/solid/src/convex/DT_Polyhedron.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_Polyhedron.h b/extern/solid/src/convex/DT_Polyhedron.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_Polytope.cpp b/extern/solid/src/convex/DT_Polytope.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_Polytope.h b/extern/solid/src/convex/DT_Polytope.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_Shape.h b/extern/solid/src/convex/DT_Shape.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_Sphere.cpp b/extern/solid/src/convex/DT_Sphere.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_Sphere.h b/extern/solid/src/convex/DT_Sphere.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_Transform.h b/extern/solid/src/convex/DT_Transform.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_Triangle.cpp b/extern/solid/src/convex/DT_Triangle.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_Triangle.h b/extern/solid/src/convex/DT_Triangle.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/extern/solid/src/convex/DT_VertexBase.h b/extern/solid/src/convex/DT_VertexBase.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/bsp/extern/CSG_BooleanOps.h b/intern/bsp/extern/CSG_BooleanOps.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/bsp/intern/BSP_CSGException.h b/intern/bsp/intern/BSP_CSGException.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/bsp/intern/BSP_CSGMesh.cpp b/intern/bsp/intern/BSP_CSGMesh.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/bsp/intern/BSP_CSGMesh.h b/intern/bsp/intern/BSP_CSGMesh.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/bsp/intern/BSP_MeshPrimitives.cpp b/intern/bsp/intern/BSP_MeshPrimitives.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/bsp/intern/CSG_BooleanOps.cpp b/intern/bsp/intern/CSG_BooleanOps.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsw b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsw
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.h b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.cpp b/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.h b/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/bsp/test/BSP_GhostTest/BSP_PlyLoader.cpp b/intern/bsp/test/BSP_GhostTest/BSP_PlyLoader.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/bsp/test/BSP_GhostTest/BSP_PlyLoader.h b/intern/bsp/test/BSP_GhostTest/BSP_PlyLoader.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h b/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/bsp/test/BSP_GhostTest/main.cpp b/intern/bsp/test/BSP_GhostTest/main.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/bsp/test/BSP_GhostTest/ply.h b/intern/bsp/test/BSP_GhostTest/ply.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/bsp/test/BSP_GhostTest/plyfile.c b/intern/bsp/test/BSP_GhostTest/plyfile.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/ghost/GHOST_C-api.h b/intern/ghost/GHOST_C-api.h
index c4a2da5e7de0912ed6d2f2f9d2a18deb216cfd3c..11b0204eacb427b6b13815582e4dc03f6394a619 100644 (file)
--- a/intern/ghost/GHOST_C-api.h
+++ b/intern/ghost/GHOST_C-api.h
@@ -265,6 +265,19 @@ extern GHOST_TSuccess GHOST_AddEventConsumer(GHOST_SystemHandle systemhandle,
                                                                                          GHOST_EventConsumerHandle consumerhandle);
        
 
+/***************************************************************************************
+ ** N-degree of freedom device management functionality
+ ***************************************************************************************/
+ 
+/**
+* Open N-degree of freedom devices
+ */
+extern int GHOST_OpenNDOF(GHOST_SystemHandle systemhandle, 
+                           GHOST_WindowHandle windowhandle,
+                          GHOST_NDOFLibraryInit_fp setNdofLibraryInit, 
+                          GHOST_NDOFLibraryShutdown_fp setNdofLibraryShutdown,
+                          GHOST_NDOFDeviceOpen_fp setNdofDeviceOpen
+                          );
 
 /***************************************************************************************
  ** Cursor management functionality

diff --git a/intern/ghost/GHOST_ISystem.h b/intern/ghost/GHOST_ISystem.h
index 5e0473203dbbee163e66f4a2b78407cc2d9fc33b..0cb860d81580ae088a031a3f0f100346683b605d 100644 (file)
--- a/intern/ghost/GHOST_ISystem.h
+++ b/intern/ghost/GHOST_ISystem.h
@@ -295,6 +295,22 @@ public:
         */
        virtual GHOST_TSuccess addEventConsumer(GHOST_IEventConsumer* consumer) = 0;
        
+        /***************************************************************************************
+        ** N-degree of freedom device management functionality
+        ***************************************************************************************/
+
+   /**
+    * Starts the N-degree of freedom device manager
+    */
+   virtual int openNDOF(GHOST_IWindow*,
+       GHOST_NDOFLibraryInit_fp setNdofLibraryInit, 
+       GHOST_NDOFLibraryShutdown_fp setNdofLibraryShutdown,
+       GHOST_NDOFDeviceOpen_fp setNdofDeviceOpen
+       // original patch only
+      // GHOST_NDOFEventHandler_fp setNdofEventHandler
+       ) = 0;
+
+
        /***************************************************************************************
         ** Cursor management functionality
         ***************************************************************************************/

diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h
index d55753543708e99b52ac9c1f4fea127e72950ff7..7b791c44fd852e5d0acd780a1d802bf983d30704 100644 (file)
--- a/intern/ghost/GHOST_Types.h
+++ b/intern/ghost/GHOST_Types.h
@@ -39,6 +39,11 @@ typedef unsigned short               GHOST_TUns16;
 typedef        int                                     GHOST_TInt32;
 typedef        unsigned int            GHOST_TUns32;
 
+#ifdef WIN32
+#define WM_BLND_NDOF_AXIS      WM_USER + 1
+#define WM_BLND_NDOF_BTN       WM_USER + 2
+#endif
+
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 typedef __int64                                GHOST_TInt64;
 typedef unsigned __int64       GHOST_TUns64;
@@ -133,6 +138,9 @@ typedef enum {
        GHOST_kEventButtonUp,           /// Mouse button event
        GHOST_kEventWheel,                      /// Mouse wheel event
 
+       GHOST_kEventNDOFMotion,         /// N degree of freedom device motion event
+       GHOST_kEventNDOFButton,         /// N degree of freedom device button event
+
        GHOST_kEventKeyDown,
        GHOST_kEventKeyUp,
 //     GHOST_kEventKeyAuto,
@@ -336,6 +344,38 @@ typedef struct {
        GHOST_TInt32 z; 
 } GHOST_TEventWheelData;
 
+
+/* original patch used floats, but the driver return ints and uns. We will calibrate in view, no sense on doing conversions twice */
+/* as all USB device controls are likely to use ints, this is also more future proof */
+//typedef struct {
+//   /** N-degree of freedom device data */
+//   float tx, ty, tz;   /** -x left, +y up, +z forward */
+//   float rx, ry, rz;
+//   float dt;
+//} GHOST_TEventNDOFData;
+
+typedef struct {
+   /** N-degree of freedom device data v2*/
+   int changed;
+   GHOST_TUns64 client;
+   GHOST_TUns64 address;
+   GHOST_TInt16 tx, ty, tz;   /** -x left, +y up, +z forward */
+   GHOST_TInt16 rx, ry, rz;
+   GHOST_TInt16 buttons;
+   GHOST_TUns64 time;
+   GHOST_TUns64 delta;
+} GHOST_TEventNDOFData;
+
+typedef int     (*GHOST_NDOFLibraryInit_fp)();
+typedef void    (*GHOST_NDOFLibraryShutdown_fp)(void* deviceHandle);
+typedef void*   (*GHOST_NDOFDeviceOpen_fp)(void* platformData);
+
+// original patch windows callback. In mac os X version the callback is internal to the plug-in and post an event to main thead.
+// not necessary faster, but better integration with other events. 
+
+//typedef int     (*GHOST_NDOFEventHandler_fp)(float* result7, void* deviceHandle, unsigned int message, unsigned int* wParam, unsigned long* lParam);
+//typedef void     (*GHOST_NDOFCallBack_fp)(GHOST_TEventNDOFDataV2 *VolDatas);
+
 typedef struct {
        /** The key code. */
        GHOST_TKey              key;

diff --git a/intern/ghost/doc/ghost_interface.cfg b/intern/ghost/doc/ghost_interface.cfg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/ghost/intern/GHOST_C-api.cpp b/intern/ghost/intern/GHOST_C-api.cpp
index 60634eeff8c239fb6dfe11a7b18e6fe9e9ae3cce..8c93788ee1b7cf6b93491d60136fa65571a793ec 100644 (file)
--- a/intern/ghost/intern/GHOST_C-api.cpp
+++ b/intern/ghost/intern/GHOST_C-api.cpp
@@ -259,6 +259,21 @@ GHOST_TSuccess GHOST_AddEventConsumer(GHOST_SystemHandle systemhandle, GHOST_Eve
        return system->addEventConsumer((GHOST_CallbackEventConsumer*)consumerhandle);
 }
 
+int GHOST_OpenNDOF(GHOST_SystemHandle systemhandle, GHOST_WindowHandle windowhandle,
+   GHOST_NDOFLibraryInit_fp setNdofLibraryInit, 
+    GHOST_NDOFLibraryShutdown_fp setNdofLibraryShutdown,
+    GHOST_NDOFDeviceOpen_fp setNdofDeviceOpen)
+  //original patch only
+  /*  GHOST_NDOFEventHandler_fp setNdofEventHandler)*/
+{
+       GHOST_ISystem* system = (GHOST_ISystem*) systemhandle;
+
+    system->openNDOF((GHOST_IWindow*) windowhandle,
+        setNdofLibraryInit, setNdofLibraryShutdown, setNdofDeviceOpen);
+//     original patch
+//        setNdofLibraryInit, setNdofLibraryShutdown, setNdofDeviceOpen, setNdofEventHandler);
+}
+
 
 
 GHOST_TStandardCursor GHOST_GetCursorShape(GHOST_WindowHandle windowhandle)

diff --git a/intern/ghost/intern/GHOST_DisplayManagerX11.cpp b/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/ghost/intern/GHOST_DisplayManagerX11.h b/intern/ghost/intern/GHOST_DisplayManagerX11.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/ghost/intern/GHOST_EventNDOF.h b/intern/ghost/intern/GHOST_EventNDOF.h
new file mode 100644 (file)
index 0000000..76f5a9e
--- /dev/null
+++ b/intern/ghost/intern/GHOST_EventNDOF.h
@@ -0,0 +1,57 @@
+/*
+ * ***** 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+ 
+
+#ifndef _GHOST_EVENT_NDOF_H_
+#define _GHOST_EVENT_NDOF_H_
+
+#include "GHOST_Event.h"
+
+/**
+ * N-degree of freedom device event.
+ */
+class GHOST_EventNDOF : public GHOST_Event
+{
+public:
+       /**
+        * Constructor.
+        * @param msec          The time this event was generated.
+        * @param type          The type of this event.
+        * @param x                     The x-coordinate of the location the cursor was at at the time of the event.
+        * @param y                     The y-coordinate of the location the cursor was at at the time of the event.
+        */
+       GHOST_EventNDOF(GHOST_TUns64 msec, GHOST_TEventType type, GHOST_IWindow* window, 
+        GHOST_TEventNDOFData data)
+               : GHOST_Event(msec, type, window)
+       {
+               m_ndofEventData = data;
+               m_data = &m_ndofEventData;
+       }
+
+protected:
+       /** translation & rotation from the device. */
+       GHOST_TEventNDOFData m_ndofEventData;
+};
+
+
+#endif // _GHOST_EVENT_NDOF_H_
+

diff --git a/intern/ghost/intern/GHOST_NDOFManager.cpp b/intern/ghost/intern/GHOST_NDOFManager.cpp
new file mode 100644 (file)
index 0000000..5254952
--- /dev/null
+++ b/intern/ghost/intern/GHOST_NDOFManager.cpp
@@ -0,0 +1,124 @@
+/*
+ * ***** 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+
+#include "GHOST_NDOFManager.h"
+
+
+// the variable is outside the class because it must be accessed from plugin
+static volatile GHOST_TEventNDOFData currentNdofValues = {0,0,0,0,0,0,0,0,0,0,0};
+
+#if !defined(_WIN32) && !defined(__APPLE__)
+#include "GHOST_SystemX11.h"
+#endif
+
+namespace
+{
+    GHOST_NDOFLibraryInit_fp ndofLibraryInit = 0;
+    GHOST_NDOFLibraryShutdown_fp ndofLibraryShutdown = 0;
+    GHOST_NDOFDeviceOpen_fp ndofDeviceOpen = 0;
+}
+
+GHOST_NDOFManager::GHOST_NDOFManager()
+{
+    m_DeviceHandle = 0;
+
+    // discover the API from the plugin
+    ndofLibraryInit = 0;
+    ndofLibraryShutdown = 0;
+    ndofDeviceOpen = 0;
+}
+
+GHOST_NDOFManager::~GHOST_NDOFManager()
+{
+    if (ndofLibraryShutdown)
+        ndofLibraryShutdown(m_DeviceHandle);
+
+    m_DeviceHandle = 0;
+}
+
+
+int
+GHOST_NDOFManager::deviceOpen(GHOST_IWindow* window,
+        GHOST_NDOFLibraryInit_fp setNdofLibraryInit, 
+        GHOST_NDOFLibraryShutdown_fp setNdofLibraryShutdown,
+        GHOST_NDOFDeviceOpen_fp setNdofDeviceOpen)
+{
+       int Pid;
+       
+    ndofLibraryInit = setNdofLibraryInit;
+    ndofLibraryShutdown = setNdofLibraryShutdown;
+    ndofDeviceOpen = setNdofDeviceOpen;
+
+    if (ndofLibraryInit  && ndofDeviceOpen)
+    {
+       Pid= ndofLibraryInit();
+               printf("%i client \n", Pid);
+               #if defined(_WIN32) || defined(__APPLE__)
+                       m_DeviceHandle = ndofDeviceOpen((void *)&currentNdofValues);    
+               #else
+                       GHOST_SystemX11 *sys;
+                       sys = static_cast<GHOST_SystemX11*>(GHOST_ISystem::getSystem());
+                       void *ndofInfo = sys->prepareNdofInfo(&currentNdofValues);
+                       m_DeviceHandle = ndofDeviceOpen(ndofInfo);
+               #endif
+                return (Pid > 0) ? 0 : 1;
+                       
+       } else
+               return 1;
+}
+
+
+bool 
+GHOST_NDOFManager::available() const
+{ 
+    return m_DeviceHandle != 0; 
+}
+
+bool 
+GHOST_NDOFManager::event_present() const
+{ 
+    if( currentNdofValues.changed >0) {
+               printf("time %llu but%u x%i y%i z%i rx%i ry%i rz%i \n"  ,                       
+                               currentNdofValues.time,         currentNdofValues.buttons,
+                               currentNdofValues.tx,currentNdofValues.ty,currentNdofValues.tz,
+                               currentNdofValues.rx,currentNdofValues.ry,currentNdofValues.rz);
+       return true;
+       }else
+       return false;
+
+}
+
+void        GHOST_NDOFManager::GHOST_NDOFGetDatas(GHOST_TEventNDOFData &datas) const
+{
+       datas.tx = currentNdofValues.tx;
+       datas.ty = currentNdofValues.ty;
+       datas.tz = currentNdofValues.tz;
+       datas.rx = currentNdofValues.rx;
+       datas.ry = currentNdofValues.ry;
+       datas.rz = currentNdofValues.rz;
+       datas.buttons = currentNdofValues.buttons;
+       datas.client = currentNdofValues.client;
+       datas.address = currentNdofValues.address;
+       datas.time = currentNdofValues.time;
+       datas.delta = currentNdofValues.delta;
+}

diff --git a/intern/ghost/intern/GHOST_NDOFManager.h b/intern/ghost/intern/GHOST_NDOFManager.h
new file mode 100644 (file)
index 0000000..18d651b
--- /dev/null
+++ b/intern/ghost/intern/GHOST_NDOFManager.h
@@ -0,0 +1,52 @@
+/*
+ * ***** 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+ 
+#ifndef _GHOST_NDOFMANAGER_H_
+#define _GHOST_NDOFMANAGER_H_
+
+#include "GHOST_System.h"
+#include "GHOST_IWindow.h"
+
+
+
+class GHOST_NDOFManager
+{
+public:
+       GHOST_NDOFManager();
+       virtual ~GHOST_NDOFManager();
+
+    int deviceOpen(GHOST_IWindow* window,
+        GHOST_NDOFLibraryInit_fp setNdofLibraryInit, 
+        GHOST_NDOFLibraryShutdown_fp setNdofLibraryShutdown,
+        GHOST_NDOFDeviceOpen_fp setNdofDeviceOpen);
+        
+    void GHOST_NDOFGetDatas(GHOST_TEventNDOFData &datas) const;
+        
+    bool available() const;
+    bool event_present() const;
+
+protected:
+    void* m_DeviceHandle;
+};
+
+
+#endif

diff --git a/intern/ghost/intern/GHOST_System.cpp b/intern/ghost/intern/GHOST_System.cpp
index d91658787b96209288ab2d699dedbee8dc631cca..a083dfd88d6b864f2eec1c1de94f739624c4e636 100644 (file)
--- a/intern/ghost/intern/GHOST_System.cpp
+++ b/intern/ghost/intern/GHOST_System.cpp
@@ -47,13 +47,14 @@
 
 #include "GHOST_DisplayManager.h"
 #include "GHOST_EventManager.h"
+#include "GHOST_NDOFManager.h"
 #include "GHOST_TimerTask.h"
 #include "GHOST_TimerManager.h"
 #include "GHOST_WindowManager.h"
 
 
 GHOST_System::GHOST_System()
-: m_displayManager(0), m_timerManager(0), m_windowManager(0), m_eventManager(0)
+: m_displayManager(0), m_timerManager(0), m_windowManager(0), m_eventManager(0), m_ndofManager(0)
 {
 }
 
@@ -239,6 +240,17 @@ GHOST_TSuccess GHOST_System::pushEvent(GHOST_IEvent* event)
        return success;
 }
 
+int GHOST_System::openNDOF(GHOST_IWindow* w,
+        GHOST_NDOFLibraryInit_fp setNdofLibraryInit, 
+        GHOST_NDOFLibraryShutdown_fp setNdofLibraryShutdown,
+        GHOST_NDOFDeviceOpen_fp setNdofDeviceOpen)
+{
+ return   m_ndofManager->deviceOpen(w,
+        setNdofLibraryInit, 
+        setNdofLibraryShutdown,
+        setNdofDeviceOpen);
+}
+
 
 GHOST_TSuccess GHOST_System::getModifierKeyState(GHOST_TModifierKeyMask mask, bool& isDown) const
 {
@@ -271,6 +283,11 @@ GHOST_TSuccess GHOST_System::init()
        m_timerManager = new GHOST_TimerManager ();
        m_windowManager = new GHOST_WindowManager ();
        m_eventManager = new GHOST_EventManager ();
+    m_ndofManager = new GHOST_NDOFManager();
+
+       if(m_ndofManager)
+               printf("ndof manager \n");
+
 #ifdef GHOST_DEBUG
        if (m_eventManager) {
                m_eventManager->addConsumer(&m_eventPrinter);
@@ -306,6 +323,10 @@ GHOST_TSuccess GHOST_System::exit()
                delete m_eventManager;
                m_eventManager = 0;
        }
+    if (m_ndofManager) {
+        delete m_ndofManager;
+        m_ndofManager = 0;
+    }
        return GHOST_kSuccess;
 }
 

diff --git a/intern/ghost/intern/GHOST_System.h b/intern/ghost/intern/GHOST_System.h
index 1ded6e77a36dc667b1c73d0ac4592ff622d6eb21..8477d70c42f3114a1d5071e3a9370f74f6caf828 100644 (file)
--- a/intern/ghost/intern/GHOST_System.h
+++ b/intern/ghost/intern/GHOST_System.h
@@ -51,6 +51,7 @@ class GHOST_Event;
 class GHOST_TimerManager;
 class GHOST_Window;
 class GHOST_WindowManager;
+class GHOST_NDOFManager;
 
 /**
  * Implementation of platform independent functionality of the GHOST_ISystem
@@ -184,6 +185,27 @@ public:
         */
        virtual GHOST_TSuccess addEventConsumer(GHOST_IEventConsumer* consumer);
 
+
+
+       /***************************************************************************************
+        ** N-degree of freedom devcice management functionality
+        ***************************************************************************************/
+
+       /** Inherited from GHOST_ISystem
+     *  Opens the N-degree of freedom device manager
+        * return 0 if device found, 1 otherwise
+     */
+    virtual int openNDOF(GHOST_IWindow* w,        
+        GHOST_NDOFLibraryInit_fp setNdofLibraryInit, 
+        GHOST_NDOFLibraryShutdown_fp setNdofLibraryShutdown,
+        GHOST_NDOFDeviceOpen_fp setNdofDeviceOpen);
+        
+// original patch only        
+//        GHOST_NDOFEventHandler_fp setNdofEventHandler);
+
+
+
+
        /***************************************************************************************
         ** Cursor management functionality
         ***************************************************************************************/
@@ -243,6 +265,12 @@ public:
         */
        virtual inline GHOST_WindowManager* getWindowManager() const;
 
+       /**
+        * Returns a pointer to our n-degree of freedeom manager.
+        * @return A pointer to our n-degree of freedeom manager.
+        */
+       virtual inline GHOST_NDOFManager* getNDOFManager() const;
+
        /**
         * Returns the state of all modifier keys.
         * @param keys  The state of all modifier keys (true == pressed).
@@ -305,6 +333,9 @@ protected:
        /** The event manager. */
        GHOST_EventManager* m_eventManager;
 
+    /** The N-degree of freedom device manager */
+    GHOST_NDOFManager* m_ndofManager;
+
        /** Prints all the events. */
 #ifdef GHOST_DEBUG
        GHOST_EventPrinter m_eventPrinter;
@@ -329,5 +360,10 @@ inline GHOST_WindowManager* GHOST_System::getWindowManager() const
        return m_windowManager;
 }
 
+inline GHOST_NDOFManager* GHOST_System::getNDOFManager() const
+{
+       return m_ndofManager;
+}
+
 #endif // _GHOST_SYSTEM_H_
 

diff --git a/intern/ghost/intern/GHOST_SystemCarbon.cpp b/intern/ghost/intern/GHOST_SystemCarbon.cpp
index 46c0f51ede098e7192ca2a28c048e1996712fb78..cf4015815a9a93b309b77a46c56e1b68f7a20bfe 100644 (file)
--- a/intern/ghost/intern/GHOST_SystemCarbon.cpp
+++ b/intern/ghost/intern/GHOST_SystemCarbon.cpp
@@ -48,22 +48,33 @@
 #include "GHOST_EventButton.h"
 #include "GHOST_EventCursor.h"
 #include "GHOST_EventWheel.h"
+#include "GHOST_EventNDOF.h"
+
 #include "GHOST_TimerManager.h"
 #include "GHOST_TimerTask.h"
 #include "GHOST_WindowManager.h"
 #include "GHOST_WindowCarbon.h"
+#include "GHOST_NDOFManager.h"
 
 #define GHOST_KEY_SWITCH(mac, ghost) { case (mac): ghostKey = (ghost); break; }
 
+/* blender class and types events */
+enum {
+  kEventClassBlender              = 'blnd'
+};
+
+enum {
+       kEventBlenderNdofAxis                   = 1,
+       kEventBlenderNdofButtons                = 2
+};
+
 const EventTypeSpec    kEvents[] =
 {
        { kEventClassAppleEvent, kEventAppleEvent },
-       
 /*
        { kEventClassApplication, kEventAppActivated },
        { kEventClassApplication, kEventAppDeactivated },
 */     
-
        { kEventClassKeyboard, kEventRawKeyDown },
        { kEventClassKeyboard, kEventRawKeyRepeat },
        { kEventClassKeyboard, kEventRawKeyUp },
@@ -84,7 +95,12 @@ const EventTypeSpec  kEvents[] =
        { kEventClassWindow, kEventWindowActivated },
        { kEventClassWindow, kEventWindowDeactivated },
        { kEventClassWindow, kEventWindowUpdate },
-       { kEventClassWindow, kEventWindowBoundsChanged }
+       { kEventClassWindow, kEventWindowBoundsChanged },
+       
+       { kEventClassBlender, kEventBlenderNdofAxis },
+       { kEventClassBlender, kEventBlenderNdofButtons }
+       
+       
        
 };
 
@@ -416,7 +432,9 @@ GHOST_IWindow* GHOST_SystemCarbon::createWindow(
     return window;
 }
 
-
+/* this is an old style low level event queue.
+  As we want to handle our own timers, this is ok.
+  the full screen hack should be removed */
 bool GHOST_SystemCarbon::processEvents(bool waitForEvent)
 {
        bool anyProcessed = false;
@@ -424,7 +442,7 @@ bool GHOST_SystemCarbon::processEvents(bool waitForEvent)
        
        do {
                GHOST_TimerManager* timerMgr = getTimerManager();
-
+               
                if (waitForEvent) {
                        GHOST_TUns64 curtime = getMilliSeconds();
                        GHOST_TUns64 next = timerMgr->nextFireTime();
@@ -455,6 +473,8 @@ bool GHOST_SystemCarbon::processEvents(bool waitForEvent)
                        }
                }
 
+               
+               /* end loop when no more events available */
                while (::ReceiveNextEvent(0, NULL, 0, true, &event)==noErr) {
                        OSStatus status= ::SendEventToEventTarget(event, ::GetEventDispatcherTarget());
                        if (status==noErr) {
@@ -466,7 +486,9 @@ bool GHOST_SystemCarbon::processEvents(bool waitForEvent)
                                         * are, but we get a lot of them
                                         */
                                if (i!='cgs ') {
-                                       //printf("Missed - Class: '%.4s', Kind: %d\n", &i, ::GetEventKind(event));
+                                       if (i!='tblt') {  // tablet event. we use the one packaged in the mouse event
+                                               printf("Missed - Class: '%.4s', Kind: %d\n", &i, ::GetEventKind(event));
+                                       }
                                }
                        }
                        ::ReleaseEvent(event);
@@ -610,6 +632,7 @@ OSErr GHOST_SystemCarbon::sAEHandlerQuit(const AppleEvent *event, AppleEvent *re
 
 GHOST_TSuccess GHOST_SystemCarbon::init()
 {
+ 
     GHOST_TSuccess success = GHOST_System::init();
     if (success) {
                /*
@@ -629,6 +652,7 @@ GHOST_TSuccess GHOST_SystemCarbon::init()
                ::AEInstallEventHandler(kCoreEventClass, kAEOpenDocuments, sAEHandlerOpenDocs, (SInt32) this, false);
                ::AEInstallEventHandler(kCoreEventClass, kAEPrintDocuments, sAEHandlerPrintDocs, (SInt32) this, false);
                ::AEInstallEventHandler(kCoreEventClass, kAEQuitApplication, sAEHandlerQuit, (SInt32) this, false);
+               
     }
     return success;
 }
@@ -765,6 +789,7 @@ OSStatus GHOST_SystemCarbon::handleTabletEvent(EventRef event)
                }
        err = noErr;
        }
+
 }
 
 OSStatus GHOST_SystemCarbon::handleMouseEvent(EventRef event)
@@ -961,7 +986,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.
                                //}
@@ -1039,11 +1064,15 @@ bool GHOST_SystemCarbon::handleMenuCommand(GHOST_TInt32 menuResult)
     return handled;
 }
 
+
 OSStatus GHOST_SystemCarbon::sEventHandlerProc(EventHandlerCallRef handler, EventRef event, void* userData)
 {
        GHOST_SystemCarbon* sys = (GHOST_SystemCarbon*) userData;
     OSStatus err = eventNotHandledErr;
-
+       GHOST_IWindow* window;
+       GHOST_TEventNDOFData data;
+       UInt32 kind;
+       
     switch (::GetEventClass(event))
     {
                case kEventClassAppleEvent:
@@ -1061,7 +1090,28 @@ OSStatus GHOST_SystemCarbon::sEventHandlerProc(EventHandlerCallRef handler, Even
                case kEventClassKeyboard:
                        err = sys->handleKeyEvent(event);
                        break;
-    }
+               case kEventClassBlender :
+                       window = sys->m_windowManager->getActiveWindow();
+                       sys->m_ndofManager->GHOST_NDOFGetDatas(data);
+                       kind = ::GetEventKind(event);
+                       
+                       switch (kind)
+                       {
+                               case 1:
+                                       sys->m_eventManager->pushEvent(new GHOST_EventNDOF(sys->getMilliSeconds(), GHOST_kEventNDOFMotion, window, data));
+       //                              printf("motion\n");
+                                       break;
+                               case 2:
+                                       sys->m_eventManager->pushEvent(new GHOST_EventNDOF(sys->getMilliSeconds(), GHOST_kEventNDOFButton, window, data));
+//                                     printf("button\n");
+                                       break;
+                       }
+                       err = noErr;
+                       break;
+               default : 
+                       ;
+                       break;
+   }
 
     return err;
 }

diff --git a/intern/ghost/intern/GHOST_SystemCarbon.h b/intern/ghost/intern/GHOST_SystemCarbon.h
index 14d4f67290c5328b81ba1100fb45782a8b1a8784..68e2d059226726fb8a244e6f3bb3d440d3708a44 100644 (file)
--- a/intern/ghost/intern/GHOST_SystemCarbon.h
+++ b/intern/ghost/intern/GHOST_SystemCarbon.h
@@ -238,6 +238,10 @@ protected:
      */
     bool handleMenuCommand(GHOST_TInt32 menuResult);
     
+    /* callback for blender generated events */
+//     static OSStatus blendEventHandlerProc(EventHandlerCallRef handler, EventRef event, void* userData);
+
+
     /**
      * Callback for Carbon when it has events.
      */

diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index c423fbd29ad106b8c9145104992fbbb216b8ab38..c15e4f1246c2e81d76201cb52e50f7ee0c245cc7 100644 (file)
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -64,10 +64,12 @@
 #include "GHOST_EventCursor.h"
 #include "GHOST_EventKey.h"
 #include "GHOST_EventWheel.h"
+#include "GHOST_EventNDOF.h"
 #include "GHOST_TimerTask.h"
 #include "GHOST_TimerManager.h"
 #include "GHOST_WindowManager.h"
 #include "GHOST_WindowWin32.h"
+#include "GHOST_NDOFManager.h"
 
 // Key code values not found in winuser.h
 #ifndef VK_MINUS
@@ -845,6 +847,28 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
                                         * In GHOST, we let DefWindowProc call the timer callback.
                                         */
                                        break;
+                               case WM_BLND_NDOF_AXIS:
+                                       {
+                                               GHOST_TEventNDOFData ndofdata;
+                                               system->m_ndofManager->GHOST_NDOFGetDatas(ndofdata);
+                                               system->m_eventManager->
+                                                       pushEvent(new GHOST_EventNDOF(
+                                                               system->getMilliSeconds(), 
+                                                               GHOST_kEventNDOFMotion, 
+                                                               window, ndofdata));
+                                       }
+                                       break;
+                               case WM_BLND_NDOF_BTN:
+                                       {
+                                               GHOST_TEventNDOFData ndofdata;
+                                               system->m_ndofManager->GHOST_NDOFGetDatas(ndofdata);
+                                               system->m_eventManager->
+                                                       pushEvent(new GHOST_EventNDOF(
+                                                               system->getMilliSeconds(), 
+                                                               GHOST_kEventNDOFButton, 
+                                                               window, ndofdata));
+                                       }
+                                       break;
                        }
                }
                else {

diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp
index 55881b1f007f16138a531b2e14c70d8bddad21f8..47bcb76441ff2a7aced85a1e770e3f9ec4d012b8 100644 (file)
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -29,37 +29,6 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 
-/**
- * $Id$
- * ***** BEGIN GPL/BL DUAL 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. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
- *
- * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, 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/BL DUAL LICENSE BLOCK *****
- */
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -72,6 +41,8 @@
 #include "GHOST_EventKey.h"
 #include "GHOST_EventButton.h"
 #include "GHOST_EventWheel.h"
+#include "GHOST_EventNDOF.h"
+#include "GHOST_NDOFManager.h"
 #include "GHOST_DisplayManagerX11.h"
 
 #include "GHOST_Debug.h"
@@ -95,9 +66,21 @@
 #include <unistd.h>
 
 #include <vector>
-
 #include <stdio.h> // for fprintf only
 
+typedef struct NDOFPlatformInfo {
+       Display *display;
+       Window window;
+       volatile GHOST_TEventNDOFData *currValues;
+       Atom cmdAtom;
+       Atom motionAtom;
+       Atom btnPressAtom;
+       Atom btnRelAtom;
+} NDOFPlatformInfo;
+
+static NDOFPlatformInfo sNdofInfo = {NULL, 0, NULL, 0, 0, 0, 0};
+
+
 //these are for copy and select copy
 static char *txt_cut_buffer= NULL;
 static char *txt_select_buffer= NULL;
@@ -151,8 +134,6 @@ init(
 
        return GHOST_kFailure;
 }
-       
-
 
        GHOST_TUns64
 GHOST_SystemX11::
@@ -241,7 +222,6 @@ createWindow(
                }
        }
        return window;
-
 }
 
        GHOST_WindowX11 * 
@@ -489,10 +469,36 @@ GHOST_SystemX11::processEvent(XEvent *xe)
                                        GHOST_kEventWindowClose,
                                        window
                                );
+                       } else 
+#endif
+                       if (sNdofInfo.currValues) {
+                               static GHOST_TEventNDOFData data = {0,0,0,0,0,0,0,0,0,0,0};
+                               if (xcme.message_type == sNdofInfo.motionAtom)
+                               {
+                                       data.changed = 1;
+                                       data.delta = xcme.data.s[8] - data.time;
+                                       data.time = xcme.data.s[8];
+                                       data.tx = xcme.data.s[2];
+                                       data.ty = xcme.data.s[3];
+                                       data.tz = xcme.data.s[4];
+                                       data.rx = xcme.data.s[5];
+                                       data.ry = xcme.data.s[6];
+                                       data.rz = xcme.data.s[7];
+                                       g_event = new GHOST_EventNDOF(getMilliSeconds(),
+                                                                     GHOST_kEventNDOFMotion,
+                                                                     window, data);
+                               } else if (xcme.message_type == sNdofInfo.btnPressAtom) {
+                                       data.changed = 2;
+                                       data.delta = xcme.data.s[8] - data.time;
+                                       data.time = xcme.data.s[8];
+                                       data.buttons = xcme.data.s[2];
+                                       g_event = new GHOST_EventNDOF(getMilliSeconds(),
+                                                                     GHOST_kEventNDOFButton,
+                                                                     window, data);
+                               }
                        } else {
                                /* Unknown client message, ignore */
                        }
-#endif
                        break;
                }
                        
@@ -594,6 +600,17 @@ GHOST_SystemX11::processEvent(XEvent *xe)
        }
 }
 
+       void *
+GHOST_SystemX11::
+prepareNdofInfo(volatile GHOST_TEventNDOFData *currentNdofValues)
+{
+       const vector<GHOST_IWindow*>& v(m_windowManager->getWindows());
+       if (v.size() > 0)
+               sNdofInfo.window = static_cast<GHOST_WindowX11*>(v[0])->getXWindow();
+       sNdofInfo.display = m_display;
+       sNdofInfo.currValues = currentNdofValues;
+       return (void*)&sNdofInfo;
+}
 
        GHOST_TSuccess 
 GHOST_SystemX11::

diff --git a/intern/ghost/intern/GHOST_SystemX11.h b/intern/ghost/intern/GHOST_SystemX11.h
index 0e947c12fde4d53ab2915848d26bff2d03329111..1c100bee852704ac385d7f3235ae1cc577002174 100644 (file)
--- a/intern/ghost/intern/GHOST_SystemX11.h
+++ b/intern/ghost/intern/GHOST_SystemX11.h
@@ -196,6 +196,11 @@ public:
                return m_display;
        }       
 
+               void *
+       prepareNdofInfo(
+               volatile GHOST_TEventNDOFData *current_values
+       );
+               
        /**
         * Returns unsinged char from CUT_BUFFER0
         * @param flag          Flag indicates which buffer to return 0 for clipboard 1 for selection

diff --git a/intern/ghost/intern/GHOST_WindowX11.h b/intern/ghost/intern/GHOST_WindowX11.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/ghost/intern/Makefile b/intern/ghost/intern/Makefile
index 32498222ac616201f6a97ce38c7e7cf0e7560a32..cccbf9a822bf0740c81c2e31f8841ade9e5041d2 100644 (file)
--- a/intern/ghost/intern/Makefile
+++ b/intern/ghost/intern/Makefile
@@ -39,6 +39,7 @@ CCSRCS += GHOST_EventManager.cpp GHOST_EventPrinter.cpp GHOST_WindowManager.cpp
 CCSRCS += GHOST_ISystem.cpp GHOST_ModifierKeys.cpp GHOST_TimerManager.cpp
 CCSRCS += GHOST_Rect.cpp GHOST_DisplayManager.cpp GHOST_C-api.cpp
 CCSRCS += GHOST_CallbackEventConsumer.cpp
+CCSRCS += GHOST_NDOFManager.cpp
 
 include nan_definitions.mk
 

diff --git a/intern/ghost/make/msvc_7_0/ghost.vcproj b/intern/ghost/make/msvc_7_0/ghost.vcproj
index 9d0aef451e7b8a53647b99bbe2d315405096cff1..e5b2e09a67816a3360bc4e05e8c7ec261cd2fdc5 100644 (file)
--- a/intern/ghost/make/msvc_7_0/ghost.vcproj
+++ b/intern/ghost/make/msvc_7_0/ghost.vcproj
@@ -280,6 +280,9 @@ ECHO Done
                                <File
                                        RelativePath="..\..\intern\GHOST_EventManager.h">
                                </File>
+                               <File
+                                       RelativePath="..\..\intern\GHOST_EventNDOF.h">
+                               </File>
                                <File
                                        RelativePath="..\..\intern\GHOST_EventPrinter.h">
                                </File>
@@ -292,6 +295,9 @@ ECHO Done
                                <File
                                        RelativePath="..\..\intern\GHOST_ModifierKeys.h">
                                </File>
+                               <File
+                                       RelativePath="..\..\intern\GHOST_NDOFManager.cpp">
+                               </File>
                                <File
                                        RelativePath="..\..\intern\GHOST_System.h">
                                </File>
@@ -373,6 +379,9 @@ ECHO Done
                        <File
                                RelativePath="..\..\intern\GHOST_ModifierKeys.cpp">
                        </File>
+                       <File
+                               RelativePath="..\..\intern\GHOST_NDOFManager.cpp">
+                       </File>
                        <File
                                RelativePath="..\..\intern\GHOST_Rect.cpp">
                        </File>

diff --git a/intern/ghost/test/Makefile b/intern/ghost/test/Makefile
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/ghost/test/gears/GHOST_Test.cpp b/intern/ghost/test/gears/GHOST_Test.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/ghost/test/gears/Makefile b/intern/ghost/test/gears/Makefile
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/ghost/test/multitest/MultiTest.c b/intern/ghost/test/multitest/MultiTest.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/moto/include/MT_Matrix4x4.h b/intern/moto/include/MT_Matrix4x4.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/moto/include/MT_MinMax.h b/intern/moto/include/MT_MinMax.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/moto/include/MT_Scalar.h b/intern/moto/include/MT_Scalar.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/moto/include/MT_Stream.h b/intern/moto/include/MT_Stream.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/moto/include/MT_Tuple2.h b/intern/moto/include/MT_Tuple2.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/moto/include/MT_Tuple3.h b/intern/moto/include/MT_Tuple3.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/moto/include/MT_Tuple4.h b/intern/moto/include/MT_Tuple4.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/moto/include/MT_random.h b/intern/moto/include/MT_random.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/moto/intern/MT_CmMatrix4x4.cpp b/intern/moto/intern/MT_CmMatrix4x4.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/moto/intern/MT_random.cpp b/intern/moto/intern/MT_random.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/moto/make/msvc_6_0/MoTo.dsp b/intern/moto/make/msvc_6_0/MoTo.dsp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/intern/moto/make/msvc_6_0/MoTo.dsw b/intern/moto/make/msvc_6_0/MoTo.dsw
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj b/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
index 4a4146bf8053687f0fa5540f23be8fc59aaa3090..1e55e9795d8a2dc8a2f87345898c7d9997a22a7c 100644 (file)
--- a/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
+++ b/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
@@ -512,9 +512,6 @@
                        <File
                                RelativePath="..\..\..\source\blender\blenkernel\intern\verse_geometry_node.c">
                        </File>
-                       <File
-                               RelativePath="..\..\..\source\blender\blenkernel\intern\verse_method.c">
-                       </File>
                        <File
                                RelativePath="..\..\..\source\blender\blenkernel\intern\verse_node.c">
                        </File>

diff --git a/projectfiles_vc7/blender/ftfont/FTF_ftfont.vcproj b/projectfiles_vc7/blender/ftfont/FTF_ftfont.vcproj
index ef756c7b67fa5bfea7e052cc7dd710fd2a80b05c..9eee41b4cff5d2934641f371258b0f5b6caef050 100644 (file)
--- a/projectfiles_vc7/blender/ftfont/FTF_ftfont.vcproj
+++ b/projectfiles_vc7/blender/ftfont/FTF_ftfont.vcproj
@@ -21,7 +21,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_7\extern\ftgl\include;..\..\..\..\lib\windows\gettext\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\include"
+                               AdditionalIncludeDirectories="..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_7\extern\ftgl\include;..\..\..\..\lib\windows\gettext\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna"
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WCHAR_T16;HAVE_LC_MESSAGES;FTGL_LIBRARY_STATIC"
                                StringPooling="TRUE"
                                RuntimeLibrary="0"

diff --git a/projectfiles_vc7/blender/render/BRE_render.vcproj b/projectfiles_vc7/blender/render/BRE_render.vcproj
index 4869dd606f1702976081ad49390f9e9b44e23687..88a66defce93f1557ec011bd96bdcc2239495d03 100644 (file)
--- a/projectfiles_vc7/blender/render/BRE_render.vcproj
+++ b/projectfiles_vc7/blender/render/BRE_render.vcproj
@@ -149,10 +149,7 @@
                                RelativePath="..\..\..\source\blender\render\intern\source\pixelshading.c">
                        </File>
                        <File
-                               RelativePath="..\..\..\source\blender\render\intern\source\rayshade.c">
-                       </File>
-                       <File
-                               RelativePath="..\..\..\source\blender\render\intern\source\raytrace.c">
+                               RelativePath="..\..\..\source\blender\render\intern\source\ray.c">
                        </File>
                        <File
                                RelativePath="..\..\..\source\blender\render\intern\source\rendercore.c">

diff --git a/projectfiles_vc7/blender/src/BL_src.vcproj b/projectfiles_vc7/blender/src/BL_src.vcproj
index 8a17fc712eb55650fae3d641e62333bca85b8ec2..b0a41131ac80267fb6b99bf21086c946194adc83 100644 (file)
--- a/projectfiles_vc7/blender/src/BL_src.vcproj
+++ b/projectfiles_vc7/blender/src/BL_src.vcproj
@@ -433,9 +433,6 @@
                        <File
                                RelativePath="..\..\..\source\blender\src\mainqueue.c">
                        </File>
-                       <File
-                               RelativePath="..\..\..\source\blender\src\meshlaplacian.c">
-                       </File>
                        <File
                                RelativePath="..\..\..\source\blender\src\meshtools.c">
                        </File>
@@ -496,9 +493,6 @@
                        <File
                                RelativePath="..\..\..\source\blender\src\screendump.c">
                        </File>
-                       <File
-                               RelativePath="..\..\..\source\blender\src\sculptmode-stroke.c">
-                       </File>
                        <File
                                RelativePath="..\..\..\source\blender\src\sculptmode.c">
                        </File>
@@ -737,9 +731,6 @@
                        <File
                                RelativePath="..\..\..\source\blender\include\BIF_mainqueue.h">
                        </File>
-                       <File
-                               RelativePath="..\..\..\source\blender\include\BIF_meshlaplacian.h">
-                       </File>
                        <File
                                RelativePath="..\..\..\source\blender\include\BIF_meshtools.h">
                        </File>

diff --git a/release/datafiles/blenderbuttons b/release/datafiles/blenderbuttons
index d43180567be1d211198d711ca5c3dabd7c1178a1..4c39786b8be8d0a641c29b8c6bb7e7f08f16a293 100644 (file)
Binary files a/release/datafiles/blenderbuttons and b/release/datafiles/blenderbuttons differ

diff --git a/release/datafiles/splash.jpg b/release/datafiles/splash.jpg
index da88c0b8eaa25949fcb6fb74401fb7fc7b67ff19..243e779273d7c5f7d364d6600f3ce1ca222ee1c9 100644 (file)
Binary files a/release/datafiles/splash.jpg and b/release/datafiles/splash.jpg differ

diff --git a/release/scripts/IDPropBrowser.py b/release/scripts/IDPropBrowser.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/release/scripts/bpymodules/BPyWindow.py b/release/scripts/bpymodules/BPyWindow.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/release/scripts/bpymodules/mesh_gradient.py b/release/scripts/bpymodules/mesh_gradient.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/release/scripts/mesh_boneweight_copy.py b/release/scripts/mesh_boneweight_copy.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/release/scripts/object_cookie_cutter.py b/release/scripts/object_cookie_cutter.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/release/scripts/vertexpaint_gradient.py b/release/scripts/vertexpaint_gradient.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/release/scripts/weightpaint_gradient.py b/release/scripts/weightpaint_gradient.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/release/text/blender.html b/release/text/blender.html
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h
index 7019eb26bcb03725bbf8a0d2c5efa9eb669056d6..d1005395561ebad5b307b86cb1e41efc32555c48 100644 (file)
--- a/source/blender/blenkernel/BKE_global.h
+++ b/source/blender/blenkernel/BKE_global.h
@@ -149,6 +149,9 @@ typedef struct Global {
        int compat;      /* toggle compatibility mode for edge rendering */
        int notonlysolid;/* T-> also edge-render transparent faces       */
        
+       /* ndof device found ? */
+       int ndofdevice;
+       
        /* confusing... G.f and G.flags */
        int flags;
 

diff --git a/source/blender/blenlib/BLI_blenlib.h b/source/blender/blenlib/BLI_blenlib.h
index e8c73398635aaa77c4429dc27fc8ce7bb2614db5..7d401cf2fc33277bfc005b6d1c4ee1fa44384273 100644 (file)
--- a/source/blender/blenlib/BLI_blenlib.h
+++ b/source/blender/blenlib/BLI_blenlib.h
@@ -258,6 +258,7 @@ void BLI_free_file_lines(struct LinkNode *lines);
         */
 void BLI_where_am_i(char *fullname, const char *name);
 
+char *get_install_dir(void);
        /**
         * Gets the temp directory when blender first runs.
         * If the default path is not found, use try $TEMP

diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index a4c91d77f5e76305aac4a2e2cf0cfccb697155cc..d70fe17c67f04da69b3f26bef0c1c57a551ed246 100644 (file)
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -2129,7 +2129,7 @@ int BLO_write_file_mem(MemFile *compare, MemFile *current, int write_flags, char
 #define PATHSEPERATOR          "/"
 #endif
 
-static char *get_install_dir(void) {
+char *get_install_dir(void) {
        extern char bprogname[];
        char *tmpname = BLI_strdup(bprogname);
        char *cut;

diff --git a/source/blender/include/BIF_mywindow.h b/source/blender/include/BIF_mywindow.h
index 28de60d2bc060239345e57a50d8cb5d577c6ef70..2b3e732b027b07f945c97f81bda12a9c55fa8530 100644 (file)
--- a/source/blender/include/BIF_mywindow.h
+++ b/source/blender/include/BIF_mywindow.h
@@ -123,6 +123,9 @@ short get_mbut(void);
 short get_qual(void);
 void getmouse(short *mval);
 
+void getndof(float *sbval);
+void filterNDOFvalues(float *sbval);
+
 float get_pressure(void);
 void get_tilt(float *xtilt, float *ytilt);
 #define DEV_MOUSE      0

diff --git a/source/blender/include/BIF_resources.h b/source/blender/include/BIF_resources.h
index c76f0a9c66e55d9d4f6ed4c157cc7695da359ceb..1649287297bf1d481f0bff0f881246ecebfe26d3 100644 (file)
--- a/source/blender/include/BIF_resources.h
+++ b/source/blender/include/BIF_resources.h
@@ -84,10 +84,10 @@ typedef enum {
        ICON_SHORTDISPLAY,
        ICON_TRIA_DOWN,
        ICON_TRIA_RIGHT,
-       ICON_BLANK7,
-       ICON_BLANK8,
-       ICON_BLANK9,
-       ICON_BLANK10,
+       ICON_NDOF_TURN,
+       ICON_NDOF_FLY,
+       ICON_NDOF_TRANS,
+       ICON_NDOF_DOM,
 
        ICON_VIEW_AXIS_ALL,
        ICON_VIEW_AXIS_NONE,

diff --git a/source/blender/include/BIF_transform.h b/source/blender/include/BIF_transform.h
index e5be25ae72976dda99b2a0b70204c2accf580d2f..82d6bb84281c3b45a3adb54b0e7211df8ddda05c 100644 (file)
--- a/source/blender/include/BIF_transform.h
+++ b/source/blender/include/BIF_transform.h
@@ -73,9 +73,11 @@
 #define CTX_NO_MIRROR          16
 #define CTX_AUTOCONFIRM                32
 #define CTX_BMESH                      64
+#define CTX_NDOF                       128
 
 void initTransform(int mode, int context);
 void Transform(void);
+void NDofTransform();
 
 /* Standalone call to get the transformation center corresponding to the current situation
  * returns 1 if successful, 0 otherwise (usually means there's no selection)

diff --git a/source/blender/include/BSE_view.h b/source/blender/include/BSE_view.h
index 4e27f9f1a813aa17c72d87175123918004be45aa..0e88b2467f7866832bcaa2fe8e83a8d4cec13775 100644 (file)
--- a/source/blender/include/BSE_view.h
+++ b/source/blender/include/BSE_view.h
@@ -76,6 +76,8 @@ void sdrawbox(short x1, short y1, short x2, short y2);
 void calctrackballvecfirst(struct rcti *area, short *mval, float *vec);
 void calctrackballvec(struct rcti *area, short *mval, float *vec);
 void viewmove(int mode);
+void viewmoveNDOFfly(int mode);
+void viewmoveNDOF(int mode);
 void view_zoom_mouseloc(float dfac, short *mouseloc);
 
 int get_view3d_viewplane(int winxi, int winyi, rctf *viewplane, float *clipsta, float *clipend, float *pixsize);

diff --git a/source/blender/include/blendef.h b/source/blender/include/blendef.h
index 4ded73f10b6d368c155760522115f7911557d6db..8ed23e10641c8d45122b8681e434c0bc084b7ff1 100644 (file)
--- a/source/blender/include/blendef.h
+++ b/source/blender/include/blendef.h
@@ -238,6 +238,7 @@
 #define B_SEL_POINT            167
 #define B_SEL_END              168
 #define B_MAN_MODE             169
+#define B_NDOF                 170
 
 /* IPO: 200 */
 #define B_IPOHOME              201

diff --git a/source/blender/include/mydevice.h b/source/blender/include/mydevice.h
index bec0e13726b0f5cbf11f491b779e138119ff695f..949c9f57851d3603f6cc80136f85f68ea9bcb1c0 100644 (file)
--- a/source/blender/include/mydevice.h
+++ b/source/blender/include/mydevice.h
@@ -70,6 +70,10 @@
 #define WINQUIT                        0x018   /* signal from user that app is to go away */
 #define Q_FIRSTTIME            0x019   /* on startup */
 
+/* N-degre of freedom device : 500 */
+#define NDOFMOTION 500
+#define NDOFBUTTON 501
+
 /* standard keyboard */
 
 #define AKEY           'a'

diff --git a/source/blender/include/transform.h b/source/blender/include/transform.h
index feaa2b4d76207ceb754decda4913d6bb4ea145ac..cfe85916eb4dd3c0c245f30010f7ac9906d942b6 100644 (file)
--- a/source/blender/include/transform.h
+++ b/source/blender/include/transform.h
@@ -48,6 +48,13 @@ struct bPose;
 struct bConstraint;
 
 
+typedef struct NDofInput {
+       int             flag;
+       int             axis;
+       float   fval[7];
+       float   factor[3];
+} NDofInput;
+
 typedef struct NumInput {
     short  idx;
     short  idx_max;
@@ -172,6 +179,7 @@ typedef struct TransInfo {
     TransCon    con;            /* transformed constraint               */
     TransSnap  tsnap;
     NumInput    num;            /* numerical input                      */
+    NDofInput   ndof;           /* ndof input                           */
     char        redraw;         /* redraw flag                          */
        float           propsize;               /* proportional circle radius           */
        char            proptext[20];   /* proportional falloff text                    */
@@ -212,6 +220,9 @@ typedef struct TransInfo {
 #define NUM_NO_FRACTION                16
 #define        NUM_AFFECT_ALL          32
 
+/* NDOFINPUT FLAGS */
+#define NDOF_INIT                      1
+
 /* transinfo->state */
 #define TRANS_RUNNING  0
 #define TRANS_CONFIRM  1
@@ -478,6 +489,20 @@ short hasNumInput(NumInput *n);
 void applyNumInput(NumInput *n, float *vec);
 char handleNumInput(NumInput *n, unsigned short event);
 
+/*********************** NDofInput ********************************/
+
+void initNDofInput(NDofInput *n);
+int hasNDofInput(NDofInput *n);
+void applyNDofInput(NDofInput *n, float *vec);
+int handleNDofInput(NDofInput *n, unsigned short event, short val);
+
+/* handleNDofInput return values */
+#define NDOF_REFRESH   1
+#define NDOF_NOMOVE            2
+#define NDOF_CONFIRM   3
+#define NDOF_CANCEL            4
+
+
 /*********************** TransSpace ******************************/
 
 int manageObjectSpace(int confirm, int set);

diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 8f3d571f87865f1bd9adad8631235c960ff88f44..70a22618a159559a32221fa8a8a308caf5c80ee2 100644 (file)
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -200,6 +200,9 @@ typedef struct UserDef {
        short recent_files;             /* maximum number of recently used files to remember  */
        short smooth_viewtx;    /* miliseconds to spend spinning the view */
        short glreslimit;
+       short ndof_pan, ndof_rotate;
+       short pads[2];
+//     char pad[8];
        char versemaster[160];
        char verseuser[160];
        float glalphaclip;

diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index 78605464268735c424617e7f074b52d87415859d..180cbd2af37c720bc0cbbe12eba55687ae0b0fe4 100644 (file)
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -139,7 +139,8 @@ typedef struct View3D {
        
        short pad3;
        
-       short pad2;
+       char ndofmode;  /* mode of transform for 6DOF devices -1 not found, 0 normal, 1 fly, 2 ob transform */
+       char ndoffilter;                /*filter for 6DOF devices 0 normal, 1 dominant */
        
        void *properties_storage;       /* Nkey panel stores stuff here, not in file */
 

diff --git a/source/blender/python/api2_2x/Armature.c b/source/blender/python/api2_2x/Armature.c
index f1fb38126258737e629fc15c105ebfceaa4d255e..05caca1cc2fca53e7b790d732751cd8c65bbd9e5 100644 (file)
--- a/source/blender/python/api2_2x/Armature.c
+++ b/source/blender/python/api2_2x/Armature.c
@@ -1,5 +1,5 @@
 /*
- * $Id: Armature.c 12813 2007-12-07 09:51:02Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Armature.h b/source/blender/python/api2_2x/Armature.h
index bafd49772b00a0ae3a759b0e8a6bf1ace367cff4..7f543e375a168f1bbe3b5279564bc6faf1b75fe6 100644 (file)
--- a/source/blender/python/api2_2x/Armature.h
+++ b/source/blender/python/api2_2x/Armature.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: Armature.h 10269 2007-03-15 01:09:14Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/BGL.h b/source/blender/python/api2_2x/BGL.h
index f8dea726d73b7462400fd65581b2a8ce2caff48f..c7fbf079010eb92185cdd0b5bceb3fa3f8b68b0a 100644 (file)
--- a/source/blender/python/api2_2x/BGL.h
+++ b/source/blender/python/api2_2x/BGL.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: BGL.h 5407 2005-10-02 17:09:11Z zuster $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/BezTriple.c b/source/blender/python/api2_2x/BezTriple.c
index e4a872c52c0d7fdfbff4ec4acfdfbeec2bf3f5ce..2aa908ff2b0bae6b0dcf3d492ec684f567015b66 100644 (file)
--- a/source/blender/python/api2_2x/BezTriple.c
+++ b/source/blender/python/api2_2x/BezTriple.c
@@ -1,5 +1,5 @@
 /*
- * $Id: BezTriple.c 11241 2007-07-12 11:51:21Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/BezTriple.h b/source/blender/python/api2_2x/BezTriple.h
index 38c9b88e185ab9bf8879ad0fbfbba37eb368567a..e2e015b502dbd333a28d8aaf876f6a97e2ead6d6 100644 (file)
--- a/source/blender/python/api2_2x/BezTriple.h
+++ b/source/blender/python/api2_2x/BezTriple.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: BezTriple.h 10269 2007-03-15 01:09:14Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Blender.h b/source/blender/python/api2_2x/Blender.h
index 77f21ed333c5ee90c1c9cff15521e7a51d507574..df80daf3ceaac07e4a59cb75ea515920ac348975 100644 (file)
--- a/source/blender/python/api2_2x/Blender.h
+++ b/source/blender/python/api2_2x/Blender.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: Blender.h 4803 2005-07-18 03:50:37Z ascotan $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Bone.c b/source/blender/python/api2_2x/Bone.c
index 704fe20d6db9bdd5e53b1ebb6f28ff8f5636b416..5eeb4bb28174d77fbd1a223c119e1d9c237e386e 100644 (file)
--- a/source/blender/python/api2_2x/Bone.c
+++ b/source/blender/python/api2_2x/Bone.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: Bone.c 12399 2007-10-26 08:19:40Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Bone.h b/source/blender/python/api2_2x/Bone.h
index da7efe27931a3a2237f81e0847923e75aa9c52cf..aa076afbed75f63d6c52a303e46ac348541d6dc0 100644 (file)
--- a/source/blender/python/api2_2x/Bone.h
+++ b/source/blender/python/api2_2x/Bone.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: Bone.h 12399 2007-10-26 08:19:40Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Camera.h b/source/blender/python/api2_2x/Camera.h
index bb751a8849ad05cb6d8e6f471d42f2dcac236737..c92e51c1468dbb5d55c185140c7dcae61f6b1ad7 100644 (file)
--- a/source/blender/python/api2_2x/Camera.h
+++ b/source/blender/python/api2_2x/Camera.h
@@ -1,5 +1,5 @@
 /*
- * $Id: Camera.h 10269 2007-03-15 01:09:14Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Constraint.h b/source/blender/python/api2_2x/Constraint.h
index a9b983fadb41bec72739625da7e9a774eac9a84d..116eabbf380713bfd6af41d4c14ce1299f9f6f50 100644 (file)
--- a/source/blender/python/api2_2x/Constraint.h
+++ b/source/blender/python/api2_2x/Constraint.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: Constraint.h 10269 2007-03-15 01:09:14Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/CurNurb.c b/source/blender/python/api2_2x/CurNurb.c
index fc79296e952457e5fbb6c64595533549d7c9b27c..6b334c01c41f643370da029f4478f7d81dc4a12c 100644 (file)
--- a/source/blender/python/api2_2x/CurNurb.c
+++ b/source/blender/python/api2_2x/CurNurb.c
@@ -1,5 +1,5 @@
 /*
- * $Id: CurNurb.c 12813 2007-12-07 09:51:02Z campbellbarton $
+ * $Id$
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or

diff --git a/source/blender/python/api2_2x/CurNurb.h b/source/blender/python/api2_2x/CurNurb.h
index f7c50c41bb979265c2f3ba17234b710a8ee49f04..06dbf7190acb1f9e6c5e5c89cfb41f492a5f47d6 100644 (file)
--- a/source/blender/python/api2_2x/CurNurb.h
+++ b/source/blender/python/api2_2x/CurNurb.h
@@ -1,5 +1,5 @@
 /*
- * $Id: CurNurb.h 10269 2007-03-15 01:09:14Z campbellbarton $
+ * $Id$
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or

diff --git a/source/blender/python/api2_2x/Curve.c b/source/blender/python/api2_2x/Curve.c
index e96e25c25d86307c1fca54cead8a916e56627e26..adf7c39b45c333c6c9856e63bc956ef90d1406f7 100644 (file)
--- a/source/blender/python/api2_2x/Curve.c
+++ b/source/blender/python/api2_2x/Curve.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: Curve.c 12752 2007-12-01 23:25:00Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Curve.h b/source/blender/python/api2_2x/Curve.h
index b6c80058b77214cd309733fec6eb28e89dcc92f0..70be37500f14c9bf37ab1c3761651573e90b6266 100644 (file)
--- a/source/blender/python/api2_2x/Curve.h
+++ b/source/blender/python/api2_2x/Curve.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: Curve.h 10269 2007-03-15 01:09:14Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Draw.h b/source/blender/python/api2_2x/Draw.h
index a78b19b0ebde7b0c582dd14d70aca625b5ebe6b7..12712713d1dabdb958ad439347552addc6dfd081 100644 (file)
--- a/source/blender/python/api2_2x/Draw.h
+++ b/source/blender/python/api2_2x/Draw.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: Draw.h 11387 2007-07-27 06:14:25Z joeedh $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/EXPP_interface.c b/source/blender/python/api2_2x/EXPP_interface.c
index 9d49746ff41a2865e481baf9a451cb598ab2dc92..ee8b04ebde998b475942fa2bcc56d52d17a3c416 100644 (file)
--- a/source/blender/python/api2_2x/EXPP_interface.c
+++ b/source/blender/python/api2_2x/EXPP_interface.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: EXPP_interface.c 7338 2006-04-30 16:22:31Z ianwill $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/EXPP_interface.h b/source/blender/python/api2_2x/EXPP_interface.h
index 8ed0836820d5e8603934da21674644554086a699..80767af1c0106ed87effe7f5548a56b7d57b1fdb 100644 (file)
--- a/source/blender/python/api2_2x/EXPP_interface.h
+++ b/source/blender/python/api2_2x/EXPP_interface.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: EXPP_interface.h 7338 2006-04-30 16:22:31Z ianwill $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Effect.h b/source/blender/python/api2_2x/Effect.h
index 86996b9f8a642df4dfdf3efbd3687779e9c3de46..b26e77f17945bc1c33307696cece71c191b01abe 100644 (file)
--- a/source/blender/python/api2_2x/Effect.h
+++ b/source/blender/python/api2_2x/Effect.h
@@ -1,5 +1,5 @@
 /*
- * $Id: Effect.h 5817 2005-11-17 19:19:05Z khughes $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Font.h b/source/blender/python/api2_2x/Font.h
index 75867c5b6e7b51a01b3afc2fd0db47b763197a96..c1a1ec73fe29842d4140e7074ee2e1efdeba55b2 100644 (file)
--- a/source/blender/python/api2_2x/Font.h
+++ b/source/blender/python/api2_2x/Font.h
@@ -1,5 +1,5 @@
 /*
- * $Id: Font.h 10269 2007-03-15 01:09:14Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Geometry.c b/source/blender/python/api2_2x/Geometry.c
index 909e6e449cb53aa279548f9d61422a98541beaf8..842479e35fb9f0fe9ace5bfba781328c022c63b5 100644 (file)
--- a/source/blender/python/api2_2x/Geometry.c
+++ b/source/blender/python/api2_2x/Geometry.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: Geometry.c 12867 2007-12-13 15:06:02Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Geometry.h b/source/blender/python/api2_2x/Geometry.h
index a9a1c7cf818fef3f6230e64c9b648c39aa7bcd0e..c74f832c6421e0a68fbe67aaea98348bd0a4ff77 100644 (file)
--- a/source/blender/python/api2_2x/Geometry.h
+++ b/source/blender/python/api2_2x/Geometry.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: Geometry.h 10324 2007-03-21 17:06:02Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Group.h b/source/blender/python/api2_2x/Group.h
old mode 100644 (file)
new mode 100755 (executable)
index 68b6ce3..0512623
--- a/source/blender/python/api2_2x/Group.h
+++ b/source/blender/python/api2_2x/Group.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: Group.h 11864 2007-08-28 10:07:08Z sirdude $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Image.h b/source/blender/python/api2_2x/Image.h
index a2fb22563bbfb99e9a31e83774078171bff1d273..a36627cb236384ffa0d52626970f9e01a4fab889 100644 (file)
--- a/source/blender/python/api2_2x/Image.h
+++ b/source/blender/python/api2_2x/Image.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: Image.h 10269 2007-03-15 01:09:14Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Ipo.c b/source/blender/python/api2_2x/Ipo.c
index e150a10259c37959f54e4bc56d393f0129a71565..9b2fd082bee157ca14b2535cc2539d0859e4a73c 100644 (file)
--- a/source/blender/python/api2_2x/Ipo.c
+++ b/source/blender/python/api2_2x/Ipo.c
@@ -1,5 +1,5 @@
 /*
- * $Id: Ipo.c 12078 2007-09-18 06:41:29Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Ipo.h b/source/blender/python/api2_2x/Ipo.h
index 35893015a7985124cf89d2072580ddc2dfe4d871..d3bf2fd108b1c0d3629386d83898da1cfd03cf0e 100644 (file)
--- a/source/blender/python/api2_2x/Ipo.h
+++ b/source/blender/python/api2_2x/Ipo.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: Ipo.h 10269 2007-03-15 01:09:14Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Ipocurve.c b/source/blender/python/api2_2x/Ipocurve.c
index cc4cb066fe7c512a3f276028de6aff3b6d8874c7..b8f3c3f6dd02650a29ee87eb2227786ba9f01714 100644 (file)
--- a/source/blender/python/api2_2x/Ipocurve.c
+++ b/source/blender/python/api2_2x/Ipocurve.c
@@ -1,5 +1,5 @@
 /*
- * $Id: Ipocurve.c 12078 2007-09-18 06:41:29Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Ipocurve.h b/source/blender/python/api2_2x/Ipocurve.h
index 6c4216fa4bd96d61e471a7230cf70bab32de0943..0844e11b04b35992d1ee8db0b7b12acc31007031 100644 (file)
--- a/source/blender/python/api2_2x/Ipocurve.h
+++ b/source/blender/python/api2_2x/Ipocurve.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: Ipocurve.h 10943 2007-06-16 12:24:41Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Key.c b/source/blender/python/api2_2x/Key.c
index b223a382818534d46609ecd3cb87d184c8d07646..90a628152e07c013645b232bbba72511fdac828d 100644 (file)
--- a/source/blender/python/api2_2x/Key.c
+++ b/source/blender/python/api2_2x/Key.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: Key.c 12867 2007-12-13 15:06:02Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Key.h b/source/blender/python/api2_2x/Key.h
index 35e92fc5fea31485c6afe007bf18cb8be8783c59..87cb55d10eb4dac4051ee965f6f0d94ffd60da6c 100644 (file)
--- a/source/blender/python/api2_2x/Key.h
+++ b/source/blender/python/api2_2x/Key.h
@@ -1,5 +1,5 @@
 /*
- * $Id: Key.h 10783 2007-05-26 12:58:46Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Lamp.h b/source/blender/python/api2_2x/Lamp.h
index 01c80e0006bdf83f4b262723a5d83fa64c26b353..3ad6348a1528f4b2ce0206ae706b0229a48b0d89 100644 (file)
--- a/source/blender/python/api2_2x/Lamp.h
+++ b/source/blender/python/api2_2x/Lamp.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: Lamp.h 10269 2007-03-15 01:09:14Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Lattice.c b/source/blender/python/api2_2x/Lattice.c
index 6a9f3891e5250946422ec5e088dfb59f9b911e9a..070e8225531ddabee4d74e68cb51fa6e527bed47 100644 (file)
--- a/source/blender/python/api2_2x/Lattice.c
+++ b/source/blender/python/api2_2x/Lattice.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: Lattice.c 11130 2007-06-30 00:18:10Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Lattice.h b/source/blender/python/api2_2x/Lattice.h
index dd141f1b8dd86a337aaf70e92bf97d99e89e4bfe..fb47c2dd2e48d128fa233dfee46c4d74fa47ed57 100644 (file)
--- a/source/blender/python/api2_2x/Lattice.h
+++ b/source/blender/python/api2_2x/Lattice.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: Lattice.h 10269 2007-03-15 01:09:14Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Library.c b/source/blender/python/api2_2x/Library.c
index 412daf24bd26deb146bfc07bcb68c491090f3046..1aacaf5678686c08ac39ed0a2e62bc49d893a8bb 100644 (file)
--- a/source/blender/python/api2_2x/Library.c
+++ b/source/blender/python/api2_2x/Library.c
@@ -1,5 +1,5 @@
 /**
- * $Id: Library.c 10943 2007-06-16 12:24:41Z campbellbarton $
+ * $Id$
  *
  * Blender.Library BPython module implementation.
  * This submodule has functions to append data from .blend files.

diff --git a/source/blender/python/api2_2x/Library.h b/source/blender/python/api2_2x/Library.h
index 1ddc138ea578c91f36f544868975d0ec59cd1c56..4814bf1410cbb78fef5345bcc8ac3acda4f525e6 100644 (file)
--- a/source/blender/python/api2_2x/Library.h
+++ b/source/blender/python/api2_2x/Library.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: Library.h 10323 2007-03-21 14:25:31Z stiv $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/MTex.c b/source/blender/python/api2_2x/MTex.c
index 61d809411a11e8bd6f8616586c096376f34e26fc..4f7cff35c116ed88914fa774f9a4d9cee4f0bf13 100644 (file)
--- a/source/blender/python/api2_2x/MTex.c
+++ b/source/blender/python/api2_2x/MTex.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: MTex.c 10279 2007-03-16 11:38:02Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/MTex.h b/source/blender/python/api2_2x/MTex.h
index 36cfa1c477afa8e37a5215fef43ce3b912ab00d7..2148212d82f25912899b296c36c0344a756601dd 100644 (file)
--- a/source/blender/python/api2_2x/MTex.h
+++ b/source/blender/python/api2_2x/MTex.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: MTex.h 10269 2007-03-15 01:09:14Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Material.h b/source/blender/python/api2_2x/Material.h
index 18fc87ee8036a4314e992ea9feeec960d553014b..c4061f795c785075104bb298b167fa8184371435 100644 (file)
--- a/source/blender/python/api2_2x/Material.h
+++ b/source/blender/python/api2_2x/Material.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: Material.h 10649 2007-05-04 03:23:40Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Mathutils.h b/source/blender/python/api2_2x/Mathutils.h
index 56d96d8f281a1eb04b5e029d0bf5075e052d9c52..901cb2139d706623a3172616b6c88fc75bc86caf 100644 (file)
--- a/source/blender/python/api2_2x/Mathutils.h
+++ b/source/blender/python/api2_2x/Mathutils.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: Mathutils.h 10943 2007-06-16 12:24:41Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Mesh.h b/source/blender/python/api2_2x/Mesh.h
index d73c5c5925ef99f52dd490b051eb06c6fdd6cd1f..0938f5fe8eff5b2465c7053463688c464593ddcc 100644 (file)
--- a/source/blender/python/api2_2x/Mesh.h
+++ b/source/blender/python/api2_2x/Mesh.h
@@ -1,5 +1,5 @@
 /*
- * $Id: Mesh.h 10269 2007-03-15 01:09:14Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Metaball.c b/source/blender/python/api2_2x/Metaball.c
index 72152bd1a9aede8f610c939154d4ca4153296300..98dc7ea1127e76252fa5aea82feddcb879eba988 100644 (file)
--- a/source/blender/python/api2_2x/Metaball.c
+++ b/source/blender/python/api2_2x/Metaball.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: Metaball.c 11136 2007-07-01 05:41:23Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Metaball.h b/source/blender/python/api2_2x/Metaball.h
index 6be35dbd3fb0226542ca7a16b8c81d0d65420472..a54424302dfef2f837ab388c4889f428a8c42981 100644 (file)
--- a/source/blender/python/api2_2x/Metaball.h
+++ b/source/blender/python/api2_2x/Metaball.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: Metaball.h 10269 2007-03-15 01:09:14Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Modifier.h b/source/blender/python/api2_2x/Modifier.h
index 12afc591c2c353c60e8b3609bd5548a49ab6a279..e61371cd1925842f895074089696eb44f5cb4a98 100644 (file)
--- a/source/blender/python/api2_2x/Modifier.h
+++ b/source/blender/python/api2_2x/Modifier.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: Modifier.h 10269 2007-03-15 01:09:14Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/NLA.h b/source/blender/python/api2_2x/NLA.h
index 50bfa32b7e7c51d952b659a4a86544c60dbd0a99..45873db40a4e5cdabffde7e3c6043fac78b64435 100644 (file)
--- a/source/blender/python/api2_2x/NLA.h
+++ b/source/blender/python/api2_2x/NLA.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: NLA.h 10269 2007-03-15 01:09:14Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/NMesh.h b/source/blender/python/api2_2x/NMesh.h
index 3a3b6e10088cda5deec2fe071a4b7b26a42c6fff..13ae12af52252b3f0976d1147c1c7b95ac708b8c 100644 (file)
--- a/source/blender/python/api2_2x/NMesh.h
+++ b/source/blender/python/api2_2x/NMesh.h
@@ -1,5 +1,5 @@
 /*
- * $Id: NMesh.h 10269 2007-03-15 01:09:14Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Noise.c b/source/blender/python/api2_2x/Noise.c
index dcee6f45d2afebb1657a54088cb91cf3e9e4446f..c1a41d46714f71cfc82ed12b71bd465c4f0aeb52 100644 (file)
--- a/source/blender/python/api2_2x/Noise.c
+++ b/source/blender/python/api2_2x/Noise.c
@@ -1,5 +1,5 @@
 /**
- * $Id: Noise.c 12056 2007-09-17 06:11:06Z aligorith $
+ * $Id$
  *
  * Blender.Noise BPython module implementation.
  * This submodule has functions to generate noise of various types.

diff --git a/source/blender/python/api2_2x/Object.h b/source/blender/python/api2_2x/Object.h
index 7891f99da09b8d1143c9441229154c4a1b5e0f0e..557513560fd81589603be44cabc29f91e794ba33 100644 (file)
--- a/source/blender/python/api2_2x/Object.h
+++ b/source/blender/python/api2_2x/Object.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: Object.h 10269 2007-03-15 01:09:14Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Particle.c b/source/blender/python/api2_2x/Particle.c
index 84c0c7277923decd2c13826952ecbb52d4f87ad5..e2fdbc5b6adb9e202be7ef7b586c9e131a3d5e77 100644 (file)
--- a/source/blender/python/api2_2x/Particle.c
+++ b/source/blender/python/api2_2x/Particle.c
@@ -1,5 +1,5 @@
 /*
- * $Id: Particle.c 10279 2007-03-16 11:38:02Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Particle.h b/source/blender/python/api2_2x/Particle.h
index 73b5363dac6f6ffe4ec1aa11ac4487d579aa5c29..f9b75b20c631c3ba691e7cdeb93f72d6a5fb2a81 100644 (file)
--- a/source/blender/python/api2_2x/Particle.h
+++ b/source/blender/python/api2_2x/Particle.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: Particle.h 5702 2005-11-04 20:34:38Z khughes $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Registry.c b/source/blender/python/api2_2x/Registry.c
index 4eb4fd93294f2b828606bf5479ae07302ab2a5c2..8fa77b20741fc24d52d95795a081eed51ab934a9 100644 (file)
--- a/source/blender/python/api2_2x/Registry.c
+++ b/source/blender/python/api2_2x/Registry.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: Registry.c 4803 2005-07-18 03:50:37Z ascotan $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Registry.h b/source/blender/python/api2_2x/Registry.h
index 58cfe65dfd000ed3105edde0eeae75cfca70e60d..4383d63e0bc407215ec08ad30545bace779f8e05 100644 (file)
--- a/source/blender/python/api2_2x/Registry.h
+++ b/source/blender/python/api2_2x/Registry.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: Registry.h 3209 2004-10-07 19:25:40Z stiv $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Scene.h b/source/blender/python/api2_2x/Scene.h
index eefa72562b5e34a71423769573de21efd5f22fe2..e6e509159d5e9e4c153a59b3043c437634dad0c5 100644 (file)
--- a/source/blender/python/api2_2x/Scene.h
+++ b/source/blender/python/api2_2x/Scene.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: Scene.h 10269 2007-03-15 01:09:14Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Sound.c b/source/blender/python/api2_2x/Sound.c
index 25f557eb0c188dd4f1c73aa62248ead64ab954f2..6e20e4c3ee53b7af223301f9afac63a26de3c439 100644 (file)
--- a/source/blender/python/api2_2x/Sound.c
+++ b/source/blender/python/api2_2x/Sound.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: Sound.c 11123 2007-06-29 08:59:26Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Sound.h b/source/blender/python/api2_2x/Sound.h
index 06e9a95bdc5d78cf845c11e43e008357f9b64d9b..7a84bbd901d19984ff6cc98c4de58a5d05fe286a 100644 (file)
--- a/source/blender/python/api2_2x/Sound.h
+++ b/source/blender/python/api2_2x/Sound.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: Sound.h 10269 2007-03-15 01:09:14Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/SurfNurb.c b/source/blender/python/api2_2x/SurfNurb.c
index 1d2e74a26a8be69442471a9a3008f5cde7f90273..3499ec099365f6e2af954aaf1378590558b83472 100644 (file)
--- a/source/blender/python/api2_2x/SurfNurb.c
+++ b/source/blender/python/api2_2x/SurfNurb.c
@@ -1,5 +1,5 @@
 /*
- * $Id: SurfNurb.c 11400 2007-07-28 09:26:53Z campbellbarton $
+ * $Id$
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or

diff --git a/source/blender/python/api2_2x/SurfNurb.h b/source/blender/python/api2_2x/SurfNurb.h
index 30d9a48012ed639575fd8bbff978f03483ebfcaf..0559d84cbaf500c868d014bfa502d96e92ba78fe 100644 (file)
--- a/source/blender/python/api2_2x/SurfNurb.h
+++ b/source/blender/python/api2_2x/SurfNurb.h
@@ -1,5 +1,5 @@
 /*
- * $Id: SurfNurb.h 10269 2007-03-15 01:09:14Z campbellbarton $
+ * $Id$
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or

diff --git a/source/blender/python/api2_2x/Sys.c b/source/blender/python/api2_2x/Sys.c
index e936eb56b597ed9c539e04e157f257cf1f191c4d..7dc841e9d6800776ad85c6b3d2e1fca7beab0ac3 100644 (file)
--- a/source/blender/python/api2_2x/Sys.c
+++ b/source/blender/python/api2_2x/Sys.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: Sys.c 10945 2007-06-16 13:17:41Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Sys.h b/source/blender/python/api2_2x/Sys.h
index 3e5f78f49227f21cc3d51b5ec07807a67c87befb..d6e2689bba5b279e21b1e3524f62a8832f5188bd 100644 (file)
--- a/source/blender/python/api2_2x/Sys.h
+++ b/source/blender/python/api2_2x/Sys.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: Sys.h 4803 2005-07-18 03:50:37Z ascotan $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Text.h b/source/blender/python/api2_2x/Text.h
index 90de82f1254faef8480ad14189ec0a0937a55377..b40c3807a815a1b49224cc24bd3a4b3544410cea 100644 (file)
--- a/source/blender/python/api2_2x/Text.h
+++ b/source/blender/python/api2_2x/Text.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: Text.h 10136 2007-02-25 01:07:28Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Text3d.c b/source/blender/python/api2_2x/Text3d.c
index 6194b23240174c307d157c48272d8214113ff967..57a9c74b71de43304f66ce818c8a06eac3de51d2 100644 (file)
--- a/source/blender/python/api2_2x/Text3d.c
+++ b/source/blender/python/api2_2x/Text3d.c
@@ -1,5 +1,5 @@
 /*
- * $Id: Text3d.c 11099 2007-06-28 13:46:42Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Text3d.h b/source/blender/python/api2_2x/Text3d.h
index ddab385ca6669b0fb0cadaba11f3d19a145e8cf4..6486278f20dd7044967b62077e2a0139ad74450e 100644 (file)
--- a/source/blender/python/api2_2x/Text3d.h
+++ b/source/blender/python/api2_2x/Text3d.h
@@ -1,5 +1,5 @@
 /*
- * $Id: Text3d.h 10269 2007-03-15 01:09:14Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Texture.h b/source/blender/python/api2_2x/Texture.h
index a00fe6faf94ac395b5437172371e0af788f90fbc..a54516877792b0f00adf79a49c6462bc7507e33f 100644 (file)
--- a/source/blender/python/api2_2x/Texture.h
+++ b/source/blender/python/api2_2x/Texture.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: Texture.h 10269 2007-03-15 01:09:14Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/Types.c b/source/blender/python/api2_2x/Types.c
index 425584f84ace069c6b1f98ee648112f77ca14987..8b51c590a5ba63643f24ac575912906eb0098d0b 100644 (file)
--- a/source/blender/python/api2_2x/Types.c
+++ b/source/blender/python/api2_2x/Types.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: Types.c 11713 2007-08-19 19:06:42Z campbellbarton $
+ * $Id$
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or

diff --git a/source/blender/python/api2_2x/Types.h b/source/blender/python/api2_2x/Types.h
index b905ab75d62fb194045fe26fbfd3b57d601542b7..adaf59bbfbfe6aaca8b4e0296db9ec37148a32e0 100644 (file)
--- a/source/blender/python/api2_2x/Types.h
+++ b/source/blender/python/api2_2x/Types.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: Types.h 7266 2006-04-16 15:28:50Z stiv $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/World.c b/source/blender/python/api2_2x/World.c
index a6fac327360a004a2f8e952a1a2d49dcf9b5d203..7804a443639a26f9a295381413acd42864130b29 100644 (file)
--- a/source/blender/python/api2_2x/World.c
+++ b/source/blender/python/api2_2x/World.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: World.c 12078 2007-09-18 06:41:29Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/World.h b/source/blender/python/api2_2x/World.h
index 71c407bff19bbbf3c7849174e6776817ab8b1216..ff0ec8709d73be901b0c5f834c57cde9334f86ff 100644 (file)
--- a/source/blender/python/api2_2x/World.h
+++ b/source/blender/python/api2_2x/World.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: World.h 10269 2007-03-15 01:09:14Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/bpy.c b/source/blender/python/api2_2x/bpy.c
index 6ddbcfe409654e7c873901daae3d62b6e27a69a8..cee862c0e23f12b2d266f391dacca14f2bdb21d4 100644 (file)
--- a/source/blender/python/api2_2x/bpy.c
+++ b/source/blender/python/api2_2x/bpy.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: bpy.c 10550 2007-04-18 22:53:20Z campbellbarton $
+ * $Id$
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or

diff --git a/source/blender/python/api2_2x/bpy.h b/source/blender/python/api2_2x/bpy.h
index 855da49bd2b3019c2f693dc3f56755c985052eed..668196d8271f84c4d1b620e8a2150626494a9d6e 100644 (file)
--- a/source/blender/python/api2_2x/bpy.h
+++ b/source/blender/python/api2_2x/bpy.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: bpy.h 10546 2007-04-18 14:40:01Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/bpy_config.c b/source/blender/python/api2_2x/bpy_config.c
index ce8ce0bc39caecccc6c3c5685ca8c46fbcf2cc7f..a061f31d8a093eef8b12e496d697aec15b1c9895 100644 (file)
--- a/source/blender/python/api2_2x/bpy_config.c
+++ b/source/blender/python/api2_2x/bpy_config.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: bpy_config.c 11123 2007-06-29 08:59:26Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/bpy_config.h b/source/blender/python/api2_2x/bpy_config.h
index ae1f114dc81337e2a6a9889efb7bcbab8208f3f6..979953acd76b0aafc26e977a478a3598297b4b2b 100644 (file)
--- a/source/blender/python/api2_2x/bpy_config.h
+++ b/source/blender/python/api2_2x/bpy_config.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: bpy_config.h 10546 2007-04-18 14:40:01Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/bpy_types.h b/source/blender/python/api2_2x/bpy_types.h
index fcada098d1ea7b44cf08f475d4815d90cbc55023..0b83db6c6746a8e58826feb3aede48250ebfe6f6 100644 (file)
--- a/source/blender/python/api2_2x/bpy_types.h
+++ b/source/blender/python/api2_2x/bpy_types.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: bpy_types.h 4803 2005-07-18 03:50:37Z ascotan $
+ * $Id$
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or

diff --git a/source/blender/python/api2_2x/charRGBA.c b/source/blender/python/api2_2x/charRGBA.c
index 087ddecc1c51209eba8a37718993d414a9978131..43c9b7772fa9d6ea554887d2fe0d98474549104d 100644 (file)
--- a/source/blender/python/api2_2x/charRGBA.c
+++ b/source/blender/python/api2_2x/charRGBA.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: charRGBA.c 10782 2007-05-26 04:39:31Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/charRGBA.h b/source/blender/python/api2_2x/charRGBA.h
index 9cc3dc739d16e5ade07fbb7df3701f65f86c1b6d..20573f1ce7bc03fc39246b465aeb16e8dd71a238 100644 (file)
--- a/source/blender/python/api2_2x/charRGBA.h
+++ b/source/blender/python/api2_2x/charRGBA.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: charRGBA.h 10280 2007-03-16 14:44:31Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/constant.c b/source/blender/python/api2_2x/constant.c
index 1034fbd616c4779389357047caab5a6335be9ab2..3a64de610f1d3d25d945f231a68ad166ea65cbf1 100644 (file)
--- a/source/blender/python/api2_2x/constant.c
+++ b/source/blender/python/api2_2x/constant.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: constant.c 10778 2007-05-25 16:43:25Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/constant.h b/source/blender/python/api2_2x/constant.h
index 1e325cef012189917261d90e30d4b2022c8ac741..a3eb7e98e0d4f4a42ad9eb3ca12c6acc1812aece 100644 (file)
--- a/source/blender/python/api2_2x/constant.h
+++ b/source/blender/python/api2_2x/constant.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: constant.h 7089 2006-03-18 15:23:02Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/euler.c b/source/blender/python/api2_2x/euler.c
index acbc2b4e680288c4fd90424d182964f087f06ff3..53489e0f737fe1c75e121b05b28a18d1ac7b7ae5 100644 (file)
--- a/source/blender/python/api2_2x/euler.c
+++ b/source/blender/python/api2_2x/euler.c
@@ -1,5 +1,5 @@
 /*
- * $Id: euler.c 12314 2007-10-20 20:24:09Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/euler.h b/source/blender/python/api2_2x/euler.h
index d992d61b402127a2a913d1a2d2847b3bcb89e9ad..62e5855891b404bdd90a2b24364f8c8823356c7a 100644 (file)
--- a/source/blender/python/api2_2x/euler.h
+++ b/source/blender/python/api2_2x/euler.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: euler.h 8367 2006-08-22 09:13:44Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/gen_utils.h b/source/blender/python/api2_2x/gen_utils.h
index 3ff1517b86c5b36dd198ade51746660cdd4fcfd0..f13722e03d08955a0489ece681fa9307a6e669eb 100644 (file)
--- a/source/blender/python/api2_2x/gen_utils.h
+++ b/source/blender/python/api2_2x/gen_utils.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: gen_utils.h 11732 2007-08-20 10:08:59Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/logic.c b/source/blender/python/api2_2x/logic.c
index 6e0813be8f3b4ad70117395420d05fa0fdddf814..a09b7fa48e7448280c25da8dc05417ef9bd90d83 100644 (file)
--- a/source/blender/python/api2_2x/logic.c
+++ b/source/blender/python/api2_2x/logic.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: logic.c 11123 2007-06-29 08:59:26Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/logic.h b/source/blender/python/api2_2x/logic.h
index ea415d06a0aa6e6c1171b5f5da138553e764f13e..013c26af4f28ee5b53457cb8b19354af7dbc2992 100644 (file)
--- a/source/blender/python/api2_2x/logic.h
+++ b/source/blender/python/api2_2x/logic.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: logic.h 10269 2007-03-15 01:09:14Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/matrix.c b/source/blender/python/api2_2x/matrix.c
index d52318e93bf2aa098db8b9e0195f299c6bfa4334..fadadbb5c6a1ecf308cba2f5e69ce229fd52c67c 100644 (file)
--- a/source/blender/python/api2_2x/matrix.c
+++ b/source/blender/python/api2_2x/matrix.c
@@ -1,5 +1,5 @@
 /*
- * $Id: matrix.c 11958 2007-09-07 07:55:36Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/matrix.h b/source/blender/python/api2_2x/matrix.h
index b830038bfcc3b1b8488018006f531fd644b6e11a..a2581ab009b4af53b8137f07610e17c1e16b154a 100644 (file)
--- a/source/blender/python/api2_2x/matrix.h
+++ b/source/blender/python/api2_2x/matrix.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: matrix.h 8363 2006-08-21 13:52:32Z campbellbarton $
+ * $Id$
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or

diff --git a/source/blender/python/api2_2x/meshPrimitive.c b/source/blender/python/api2_2x/meshPrimitive.c
index 754f498664668af05be07b661409a1098c450278..098d5f7d5f6e47590bc2e5ea538ebfffdc28f401 100644 (file)
--- a/source/blender/python/api2_2x/meshPrimitive.c
+++ b/source/blender/python/api2_2x/meshPrimitive.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: meshPrimitive.c 10773 2007-05-24 15:00:10Z khughes $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/meshPrimitive.h b/source/blender/python/api2_2x/meshPrimitive.h
index e864ffd0d1798488b68b50a523cbb3ea9f96c9d8..1aa60c31eb46c922d21879b9a2556cdac7a952da 100644 (file)
--- a/source/blender/python/api2_2x/meshPrimitive.h
+++ b/source/blender/python/api2_2x/meshPrimitive.h
@@ -1,5 +1,5 @@
 /*
- * $Id: meshPrimitive.h 7512 2006-05-25 16:45:24Z khughes $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/modules.h b/source/blender/python/api2_2x/modules.h
index 81e138da7986bfa4a4ede7693dec5742c2a96bfb..fd03469f772fd6bcac90886e82587de3d6117f68 100644 (file)
--- a/source/blender/python/api2_2x/modules.h
+++ b/source/blender/python/api2_2x/modules.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: modules.h 4803 2005-07-18 03:50:37Z ascotan $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/point.c b/source/blender/python/api2_2x/point.c
index 969fe2d53af714bf5fb778b07337f0506af04c56..686a4529d9bf50984a4245d860e26d6d7c1405f2 100644 (file)
--- a/source/blender/python/api2_2x/point.c
+++ b/source/blender/python/api2_2x/point.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: point.c 10782 2007-05-26 04:39:31Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/point.h b/source/blender/python/api2_2x/point.h
index 4ecceb64491119ff8516b3dcbcc7ce81a9c3dd21..0ea8cb1fe6eed9fdade9c4940a336a56f8074159 100644 (file)
--- a/source/blender/python/api2_2x/point.h
+++ b/source/blender/python/api2_2x/point.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: point.h 7266 2006-04-16 15:28:50Z stiv $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/quat.h b/source/blender/python/api2_2x/quat.h
index c66300de498c0bfde08162595bdfcfc4ef299038..2e5f6788b2e4788517932f81702a27fb76fac204 100644 (file)
--- a/source/blender/python/api2_2x/quat.h
+++ b/source/blender/python/api2_2x/quat.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: quat.h 8367 2006-08-22 09:13:44Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/rgbTuple.c b/source/blender/python/api2_2x/rgbTuple.c
index 85fa26433fc47222db014dc481c5430e74cdc1c7..d8bfd9307520917de60c78a29c1923561b93bd34 100644 (file)
--- a/source/blender/python/api2_2x/rgbTuple.c
+++ b/source/blender/python/api2_2x/rgbTuple.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: rgbTuple.c 11713 2007-08-19 19:06:42Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/rgbTuple.h b/source/blender/python/api2_2x/rgbTuple.h
index 59c0f02643f96063466c4ec326b56f2a1cd0c9d2..a1af0e275493a66b1a6324b862efa68e839e1962 100644 (file)
--- a/source/blender/python/api2_2x/rgbTuple.h
+++ b/source/blender/python/api2_2x/rgbTuple.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: rgbTuple.h 5317 2005-09-21 19:48:40Z stiv $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/sceneRadio.c b/source/blender/python/api2_2x/sceneRadio.c
index a39186b8e2847bc4f605191c12d0b70568bd47d0..ca76869a6158cf7627f77e68d9a81b5e5a64e08c 100644 (file)
--- a/source/blender/python/api2_2x/sceneRadio.c
+++ b/source/blender/python/api2_2x/sceneRadio.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: sceneRadio.c 10270 2007-03-15 01:47:53Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/sceneRadio.h b/source/blender/python/api2_2x/sceneRadio.h
index 98604d9afb2ed9aa02385369fdeedaae683ed82f..9d7d43aed8b2cb1298c2b27d631904f9c5c27a21 100644 (file)
--- a/source/blender/python/api2_2x/sceneRadio.h
+++ b/source/blender/python/api2_2x/sceneRadio.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: sceneRadio.h 10269 2007-03-15 01:09:14Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/sceneSequence.h b/source/blender/python/api2_2x/sceneSequence.h
index 2d8431fae80d97d4c47527e137066a4c84fdb4ef..952e861f46d1b8d0ad2602f8c45673311d4953d9 100644 (file)
--- a/source/blender/python/api2_2x/sceneSequence.h
+++ b/source/blender/python/api2_2x/sceneSequence.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: sceneSequence.h 11400 2007-07-28 09:26:53Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/sceneTimeLine.c b/source/blender/python/api2_2x/sceneTimeLine.c
index 9feba1eb462ee0755254a2249d10e0ac8159e4d3..ab74115574ea2c7b90a2b390b91e28f7e721e609 100644 (file)
--- a/source/blender/python/api2_2x/sceneTimeLine.c
+++ b/source/blender/python/api2_2x/sceneTimeLine.c
@@ -1,4 +1,4 @@
-/* $Id: sceneTimeLine.c 10778 2007-05-25 16:43:25Z campbellbarton $
+/* $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/sceneTimeLine.h b/source/blender/python/api2_2x/sceneTimeLine.h
index 0a3aa62b5710d6e6c8cfcb90a567684e084707c9..ffeff1ef3b743a357261aa0303a5c2615ab4478a 100644 (file)
--- a/source/blender/python/api2_2x/sceneTimeLine.h
+++ b/source/blender/python/api2_2x/sceneTimeLine.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: sceneTimeLine.h 10269 2007-03-15 01:09:14Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/vector.h b/source/blender/python/api2_2x/vector.h
index 040f1ba5594a9fa79b08ccb685ad558ba631346c..3f58d9fa6d5416b547c5cb0fb1684f657e32e3f6 100644 (file)
--- a/source/blender/python/api2_2x/vector.h
+++ b/source/blender/python/api2_2x/vector.h
@@ -1,4 +1,4 @@
-/* $Id: vector.h 10313 2007-03-20 12:07:02Z campbellbarton $
+/* $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/python/api2_2x/windowTheme.h b/source/blender/python/api2_2x/windowTheme.h
index 45900830706cb41562c8d6a19e5f9d2047bebc2c..761d509724dfb962653d95c7d010fbfef4f19248 100644 (file)
--- a/source/blender/python/api2_2x/windowTheme.h
+++ b/source/blender/python/api2_2x/windowTheme.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: windowTheme.h 8774 2006-11-07 11:24:11Z jesterking $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *

diff --git a/source/blender/src/blenderbuttons.c b/source/blender/src/blenderbuttons.c
index b5fe868c6e3727788fd3ba5ea6f52e1f56f1c0c1..2659a278ac713fdf0800b1d36e9a87c18bd6910a 100644 (file)
--- a/source/blender/src/blenderbuttons.c
+++ b/source/blender/src/blenderbuttons.c
@@ -1,2066 +1,2131 @@
 /* DataToC output of file <blenderbuttons> */
 
-int datatoc_blenderbuttons_size= 65917;
+int datatoc_blenderbuttons_size= 67984;
 char datatoc_blenderbuttons[]= {
-137, 80, 78, 71, 13, 10, 26, 10,  0,  0,  0, 13, 73, 72, 68, 82,  0,  0,  2,  0,  0,  0,  1,  0,  8,  6,  0,  0,  0,
-197,144,206,103,  0,  0,  0,  1,115, 82, 71, 66,  0,174,206, 28,233,  0,  0,  0,  6, 98, 75, 71, 68,  0,255,  0,255,  0,255,160,
-189,167,147,  0,  0,  0,  9,112, 72, 89,115,  0,  0, 11, 19,  0,  0, 11, 19,  1,  0,154,156, 24,  0,  0,  0,  7,116, 73, 77, 69,
-  7,216,  2, 17, 21, 28, 41, 30,244,243,210,  0,  0, 32,  0, 73, 68, 65, 84,120,218,236,125,121, 92, 84, 85,255,255,251,220,217,
-217, 23,  1, 21,151,193,125, 95,201, 37, 55, 40, 53,243,155,153,  6,148,154,100,101, 98,137,218,147,166, 61,101,143,250,211, 71,
-197,164, 50, 53,161,167,210,172, 52,  5,115,201, 45, 81,  7,245, 81, 82,113, 47, 23, 20, 69,  4, 69,150, 97, 22,102,187,115,151,
-223, 31, 51, 67,  3,  2,179,128, 91,207,188, 95,220,215,229,222,123,238,103,206, 61,219,103, 61,231,144, 30, 61,122,240,240,192,
-  3, 15, 60,240,192,  3, 15,254,167, 64,121,138,192,  3, 15, 60,240,192,  3, 15,254,119,112,230,236,  1,  0,  0,241, 88,  0, 60,
-240,192,  3, 15, 60,240,192, 99,  1,240,192,  3, 15, 60,240,192,  3, 15, 60,  2,128,  7, 30,120,224,129,  7, 30,120,224, 17,  0,
- 60,240,192,  3, 15, 60,240,192,131,191,  5,132,246, 23,231,206,157, 35,238, 18,170, 41,150,192, 67,207, 67,175, 54,164,166,166,
-242,107,215,174,125,100,249, 27, 55,110, 28,191,105,211, 38,226,169,143, 39,154, 30,234, 65, 15,158,242,243,208,251, 59,211,115,
- 89,  0,248, 31, 71,245,  2, 36,143,115, 62, 83, 82, 82, 48,117,234, 84,226,169, 54,247,235,120,216,176, 97,149,215, 25, 25, 25,
-127,139,178, 28,253, 82, 66,157,  3,193,142,237,169,127,235, 54, 35, 11,220,  6,169,177, 13, 34, 64,163,  2,123,145, 99,152,247,
- 56,183, 69, 79,255,245,224,241,177,  0, 60,140,198, 58,122,244,232,168, 29, 59,118, 40,236,174,163,119,236,216,145,249, 88,244,
- 72,222, 50,118, 18,242,216,246, 75, 62, 47, 47, 15,  0, 32,151,203,159,164, 65,196,105,233,116,220,184,113, 78,167,221,180,105,
-147, 43,130, 26,191,101,203,150,202,139,109,219,182, 97,216,176, 97, 85,158, 63, 42, 33, 32, 59, 59,155,  7,128,200,200, 72,210,
- 16,233,118,108, 79,125,160,245, 23, 30,209, 28,  0,112,207,104,  4, 99, 48, 89,110,170, 52,  0,128,216,216, 88,164,165,165,213,
-154,191,222,185,189,249,182,119,219,186,244,227, 63, 15,252,217,137,122,145, 33,240,221,139, 48,238,216,134,242,242, 49, 40,  7,
-208, 75,246, 41,230,201, 78,163,185, 20, 40, 49,230, 98,158, 33,206,165,223,141,141,141,141, 74, 75, 75, 83, 84,187, 23,157,150,
-150,150,249,152,245,173,  6,105,183, 79,200,247, 54, 56,154,  4, 75,136,143,200,159,152,164, 98,222,164, 50, 80, 21,  6, 13,167,
- 51,153,255, 39,102,199, 57, 20,  0,172, 12,219,118,174,111, 67,224,119,236,216,129,133, 91, 22,195,167,185, 63, 42,110,171, 49,
- 63,110,158,226, 49,215,184, 31, 39, 16,185, 92,206,231,229,229, 33, 47, 47, 15,251,246,237,195,212,169, 83, 31, 87, 33,192,214,
-129, 72,106,106,170, 40, 33, 33,193,188,124,249,242, 83,  0, 48,103,206,156,167,234,122,113,204,152, 49,149,255, 51, 12, 11,218,
-108,  2,109,162, 65,211,150,131, 97, 24,204,153, 51,199,165,188,216, 51,255,154, 96, 21,  6,248, 71,105,  9,112, 69,248,121,100,
- 26,126,128, 31, 46,220,248, 25, 50, 52,  3,139, 99, 40,254,230, 12,206,231,150, 97,236,178,117, 78,189,222,246,110, 91, 39, 25,
-186,  5,175,254,247, 85,135,101, 34, 27, 57, 15, 65,163,223, 66,225,123,189,  0, 67,121,229,253, 51,134, 15,112,  6,  0, 12,192,
- 96, 89, 44, 14,  6,158, 70,  0,128,222,229,189,157,106, 51,105,105,105,247,221,180, 99,144,228, 49,234, 99, 13, 49,  6, 60,  9,
-223,219,160, 24,208,173,  7,121, 45, 60, 66,168,106,209, 72, 16,218, 49,156, 18,146, 80,162, 87,171, 57, 41,194, 88,170,103, 51,
-246,245, 81,195, 89, 39, 73,221,113,225,103,155, 58,145,102,150, 11,244,146, 31,168,  0,176, 99,199, 14,197,150, 79, 62, 66,220,
-162, 37,138,122, 54,  2,222,198,248,  1,160, 84, 95,  6,  4,  3,255, 60,184,  0,154, 27,229, 88,243,246,202,199,141,145,213, 54,
-240, 60,234, 60, 86, 10,  1, 35, 70,140, 64, 94, 94, 30,228,114,249, 99, 87,118, 10,133,101,220,136,142,142,230,  1, 80,169,169,
-169,225,  9,  9,  9,133,203,151, 47, 63,237, 44, 17,134, 97, 64,211,230, 74,198,111,207,252,179,179,179, 17, 25, 25,233, 82,166,
-226,226,226,236,153, 45, 50, 50, 50,170, 11,  0, 13,209, 86, 92,174,135,200,200, 72, 50,110,220, 56,126,248,240,225,247, 61,219,
-191,127,191,205,210, 97,179,122, 56, 77,191, 33,221,  1,225, 17,205, 81, 88,174,198, 47, 83, 95, 70, 48, 25,128,220,255,204, 70,
-171, 49,173,144,225,  2,243,175, 44, 44,171,169,141, 52,128,169, 45,124,203, 49,232,111, 85,160, 48, 33,162,206,116, 23,165,  7,
-176,176,235, 61, 44,189,248,113,125,235,179, 33,152,110, 67,210, 64,  3,211,122, 16,223,219, 32,136,143,143,247,  2,240, 52,  0,
- 31,187,219, 42,  0, 23, 54,108,216,160,116,150,206, 23,107,191,160,232, 82,147,136, 54, 25,165,229, 48, 75, 69, 34,161, 80, 99,
-148, 82, 98,177,129, 19,248,121, 51,180,204,108, 22, 22,221, 49,125,255,205,122,227,235,147, 39,177,206,124,183, 74,165,250,183,
-237,255,156,156,156, 82,111,111,111, 74,167,211,113,246,105,250,244,233,243,121,  3, 51,246, 89,245, 45, 83,161, 35,237,255,242,
-229,203,104,235,227,103,111, 13,112,199, 10, 80,201,252, 75,245,101, 88,250,236,130,202,  7,111,236,120, 23,  8,  5,198, 44,143,
-195,182, 57, 91, 92,105,100,117, 13,110,245,110,168,183,111,223,  6,  0, 52,111,222,188,202,255,112,193,156,221,128,130,  8,169,
- 77,  8, 48,155, 25, 91, 60, 64,131,104,  1, 13, 80,150,246,204, 31,  0, 72, 66, 66,  2,  0,220, 73, 77, 77, 13, 76, 72, 72, 40,
-119,154,249,155,205,160,105, 19, 76, 52, 13,115, 53,230,207,115,174, 85, 67, 92, 92, 28,178,179,179,255,234, 93,201,201,136,137,
-137,169,188, 78, 79, 79,175,183,176, 99, 39,240,212,187,253,217, 51,254,113,227,198,161,103,207,158, 54,  1,192, 85,139, 64,131,
- 52,194,130, 27,249,208,109,251, 23,124,222, 92,137,240,136,230,  8, 11,150,225,198,182, 27, 22,230, 31,224,103,113,  1,136,  4,
-206, 73,176, 13,228, 99,107,119,233, 58,110,207, 95, 12, 67,218,250,186, 45,  4, 50, 25,140, 70, 35,114,115,115, 81,108,188,138,
-118,  8,175, 53,173,213, 12, 94, 87,219, 39,182,126, 98, 77,155,233, 70,255, 34,118,253,154,119,179,159,145, 58, 24,183,211,109,
-176,166,239,141,137,137,225,  9, 33, 54, 87, 78,125,190,215,214,151,121,161, 80, 88,175, 58,143,143,143,247,  7, 48,230,224,193,
-131,255,226, 56,206,100,215,150,132,  2,129,192, 59, 62, 62,126,242,134, 13, 27,246, 56,228,152,115,103,  9, 75,239,148, 72, 69,
- 34,137, 55, 37, 36,126,188, 64,226,197,  9,  4, 66,142, 80,224,136,144,229,  5,  2,147,128, 35, 70,157,128,213,123,139, 69,228,
-155, 99,123,140,137, 73,147, 56,228, 59,206, 99,121,121,185, 70,175,215, 51,  0,160,211,233,184,143, 62,250,168,146,225, 47, 89,
-178,228, 31,245,109,239, 67,135, 14,157,106,251,255,192,129,  3, 41, 13,209,135, 40, 71,218,255,226, 87, 98, 96, 44, 41,193,236,
-206, 29, 96,239,187,119, 90, 11, 25, 61, 58, 10, 64, 21,230, 63,122,244,232,104,  0,100,244,232,209,209,235, 70,127,101,177, 44,
-182,111, 84, 37,189, 51,152,179, 38,  7,115,214,228, 96,218,138,203,120,125,209, 31, 24,251,207,115,245, 31,232, 10, 10,156, 18,
- 12, 30, 22,243,183,250,252,249, 90, 44,  1, 48,211, 52,250,246,233,211, 16, 66,  6,191,101,203, 22,108,217,178,  5, 10,133,162,
-242,112, 81,224,225, 21, 10,  5,162,163,163, 43,153,191,253,195,132,132,  4,149, 51,  3, 19,195,176, 22,205,223,100, 49,253, 87,
-103,254, 44,203, 66,103,208,185,244,129, 54,139, 65,117,171, 65,122,122, 58,210,211,211,171,  8,  3, 46,125,111,102,213,241,208,
-122, 93, 47, 33,209,198,252,199,141, 27,135,229,203,151, 87, 50,127,145, 80,228, 42,243,183, 13,224,181, 29, 78,195,128,124, 84,
-140,233, 11, 62,109, 54, 10,110,228,131, 31,211,241,175, 66, 72,155, 13, 97,147, 16, 32, 32,224,161, 74,198,186,210, 92, 24,210,
-214,131,231,121, 92,188,120, 17,131,  7, 15,134, 76, 38,171,194,248,  3,  3,  3, 97, 48, 24, 96, 48, 24, 80, 88, 88,136,241,134,
- 25,248, 38,240,189, 90,105, 58,105,242, 38,213,210,186,202,184, 27, 74, 89, 33,181, 48,127,167,219, 96,245,239,141,137,137,225,
-211,211,211,145,150,150,134,216,216, 88,190,190,223,107,101,254, 96, 24,198,237, 62, 17, 31, 31, 47,  5,240,246,129,  3,  7, 62,
- 90,180,104,209,  9, 66,136,220,118,  0,104, 22, 28, 28,236,117,232,208,161,181,241,241,241,131,235,162,243, 85,202, 90,129,128,
-136, 36, 52,195,251,153, 76,230, 80,150,227,154,177, 28, 23,193, 18,210,  2,  2, 65, 48, 33, 36,  0, 68,224,199,241,  8,226,105,
- 46, 64, 99, 48,123,135,250, 49,  2,170,143,214,169, 58,210,235,245, 76,117,173,255,113,  7, 85, 23,227,110,215,174, 29,218,250,
-248, 65, 95,116, 23,207,247,236,229, 50,131,182,  9, 17, 11,183, 44,  6,128, 74,230,111,179, 34,236,216,177, 35,211, 38,  4, 20,
-104,238,160,215,156,126, 46,  9, 25, 58,  3, 11,157,129,197,221, 50, 19, 10, 75,140,184,125,207,232, 22,227,179,117, 22, 71,204,
-255, 81,161, 14, 33,  0, 70,218,  4,163,209, 88, 31,242,188, 66,161,128,205, 71, 30, 18, 18, 98,175,205,194,133,193,164,138, 38,
- 92,135, 41,209,225,160, 71,155, 77, 22,205,223, 68,131, 54, 87,101,254,102,179, 25, 58,157, 14, 90,141,246, 81, 87, 11,191,101,
- 75, 90,213, 79,178,252,193,122,223,173,  1,207,158,249,219, 24, 63, 69, 81,144, 74,165,240,246,241,170, 87,134, 71,191,148,192,
-215,118, 56,122,119,223, 63, 23, 32, 24,  3,192, 12,157, 14,  0,240,201,186,142,243,185,101,150, 65,126,232,116,152, 47, 46,  4,
- 74,203, 92, 43, 64, 43,220,253, 30,111,148,  2,  0,214,175, 95,143, 29, 59,118,224,211, 79, 63,197,201,147, 39, 97, 50,153, 80,
- 92, 92,108,211,202, 42,211,135,135,135,195,  0, 64,128,155,143,164,189,212,209,238, 73, 61,132, 70, 82,135,  5,207,101,154,246,
-150,176,154, 98,  2,220, 97,254,  0,224,174, 16, 16, 31, 31,223,216,202,252,167,124,255,253,247,151,230,205,155,247,210,198,141,
- 27,209,174, 93, 59,  0, 64,203,150, 45,161, 86,171, 37, 11, 23, 46, 60,125,232,208,161, 31,227,227,227,229,181,150, 18,199, 19,
-112,140,148,101,153, 32,150, 97,155,153, 89,115, 27,  1, 69,154,138,133,148, 72, 42, 18, 24,132, 94, 98,149,183,175, 64, 35,144,
-242,140, 84, 32,240, 22, 50,180,223,205, 51,103, 37, 19, 67,190,112,152,239,156,156,156, 82,157, 78,199,213,100,230,239,222,189,
-251, 85,154,166, 27,172, 33,117,239,222,189,193,104,  9,235, 98,220,255,153,242,214, 95,204,182,224, 54,102,119,238,128, 21, 22,
-  6,237,146,212,106,211,254,109, 76,191,218,239, 84, 94,  7,119,109,236, 82,230, 43, 12, 44,180,122,  6, 26, 29,  3,117,  5,  3,
-149,150,113,189, 87,214, 16,249,111,175,229,219,255,127,227,198, 13,168, 84,170,135, 54, 98,164,164,164, 64, 46,151,195, 22,244,
- 87,205,215,207,167,164,164,192,104, 48,212, 71,  0,224,215,173, 91,135,130,194, 66,136,  4,  2,132, 53,110, 92,133,249, 63,251,
-236,179, 56,120,240,160,179,131, 19,137,142,142,174, 46,  4, 84,177,100, 56, 27,171, 64,155,104,208, 38, 19,204,102, 26, 12,195,
- 86, 50,127,147,201,  4,189, 94,143,138,138, 10,104,181,174, 11,  0,246, 46,  0, 27,220,213,252,183,164,109,  1,120,160,212,202,
-104,172, 78,109, 16,158,183,  8,  1,105,105,136,179,104, 80, 46,245,149,234,204, 95, 36, 18, 65, 34,145, 64, 42,149, 66, 42,149,
-214,187, 77,213,230, 18,168,105, 94,188, 61,198,166,108,  5,255, 98,  4,238,245,239,133, 96, 12,128,236,229, 85, 96,238,150,  0,
-  1,126, 16,150,109,194,174, 47, 78,  3,  2,129, 75,121,169,175, 43, 64, 39,176,140, 41, 75,151, 46, 69, 73, 73,  9,214,174, 93,
-139,238,221,187, 99,209,162, 69,232,213,171, 23, 12,  6, 67,117, 13,205, 38, 82, 63,108,198,239, 44,131,118,215, 29, 80,155, 32,
-225, 50, 29,235, 44,142,202,190,225,174,107,204,158,249, 87, 50, 27,171, 16,224,162, 59,192,247,194,133, 11, 95,190,243,206, 59,
- 71,186,118,237,234,  7,  0, 11, 22, 44, 64, 78, 78, 14,  0,160, 95,191,126,248,229,151, 95, 48,112,224, 64,239,241,227,199,231,
-102,102,102, 30,120,227,141, 55,198,159, 61,123,246,190,146, 13, 10, 14,226,110,220,200,101, 50, 21,  7,247,182,105,211, 54, 51,
-162,165,252,146,192, 87, 86, 44, 32, 98, 29, 37, 17,233, 41,169,151,150, 22, 10,104,240,102,  1, 39, 53,251,106, 11,203,124, 78,
- 30, 58,215,167, 81, 96,216, 47, 14,133, 81, 59,159,255,182,109,219, 94, 31, 51,102,204,247, 54,179,191, 70,163,161,196, 98,113,
-189, 27,146,205,236,127,224,192,129,  7,107,  1,176,105,249,145,173,219,194, 88, 82,  2, 93,129,133,  9, 14,182,106,135,174, 90,
-  1,110,252,113,253, 62,218, 53, 93,151, 93, 44,114, 41,243,245,101,254,246,140,159,231,121,155,143,191, 18,102,179,185,242, 80,
-169, 84,208,233,116, 80, 42,149, 15,109,228,176,205,243,223,183,111, 95,117, 75,  0,159,146,146,130,110,221,186,193,104, 52, 84,
- 14,116, 41, 41, 41, 46,153,235,215,124,181,  6,102,179, 25,205,194,195, 97,102,217,218,152,191, 43,  3,  9,169,193,244, 95, 57,
-117,177, 46, 75,198,125,  2,  0,109,174,100,254,167, 78,158,130,222, 96,128, 86,171,133, 90,173,134, 74,165,170,162,217,185, 10,
-155, 27,160, 30,126,127,148,149,150,161,172,172, 20,165,101, 74,148,150,149,161,172,172, 12,101,165, 22,141,180, 67,199,142, 80,
- 90,255,119, 85,251,  7,128,158, 61,123,254,165,245,123,123,195,199,199, 23,190, 62,190,208,106,181,209,245,100,254,110,187,  3,
-114, 63,157,  2,209,203,171, 16,140,  1, 16,102,173,130,121,235,116, 32,192, 15, 59,223,141,193,173,157, 55, 49,106,249,  6, 64,
-248,144,151, 21, 49,222,130, 44, 92,  6,157, 78,  7,163,209,  8,189, 94,143,172,172, 44, 44, 91,182,172,198,228, 94, 94, 54, 11,
-202,117,119,152,183,187, 90,181,125,249, 18, 39,175,235, 35,100,184,218,103,171,208, 73, 75, 75, 35,177,177,177, 54,230,239,182,
-101, 66, 40, 20, 18,134, 97,170, 11,  5,112, 53, 22, 96,195,134, 13,215, 98, 99, 99,187,111,220,184,113,240,209,163, 71,125,135,
- 14, 29,122,210,198,252,173, 10, 36, 36, 18,  9,127,235,214, 45,209,222,189,123,219,  7,  6,  6,158, 26, 48, 96, 64,110, 77,180,
- 94,125,229, 85,174,109, 68, 59,109,191,126,253, 98, 46, 93,250,243, 25,141, 78,219,152,103,204, 12, 40,152, 25, 19,101, 50,153,
- 76,  6, 13,138, 52,156,201,168, 45,204, 47, 98,118,237,222,147,212, 40, 56,164,152,166,245, 14,213,247,154,180,255,242,242,114,
- 33,  0,248,249,249, 61,182,110,  1,170, 54,237,127,203, 39, 31, 89,164,230,162,187, 85,158,185, 26, 11, 48,122,244,232,232, 53,
-111,175,  4, 96,  9,248,219,177, 99,135,194,198,244,109,107,  2, 12,251,225, 37,  0,192,153,229,191,219,226,  3, 30, 22, 42, 27,
- 99, 65, 65, 65,165,182,111, 99,250,118,149, 11,173, 86, 11,163,209,104, 55,136, 60,188, 60, 78,157,106,137,253, 48, 51, 12, 46,
- 93,186,132,179,103,206,160,123,183,238, 48, 26,141, 48, 24,140, 48, 26, 12,248,241,135, 31, 96, 75,231, 76, 71, 79, 78, 78, 70,
-167,142,157, 96, 54,155,113,237,218, 53, 48,102, 26,133,  5,133, 13, 90,166,182,107,235,154,  5,182,181, 11, 28, 91,  0,204, 38,
- 48,172,197,236,127,226,196,239,208, 25,116,168,208,106,160, 86,171, 81,174, 82,161,188, 92, 89, 47, 65,204,102,  9,112, 83,251,
-  7,  0, 28, 57,114,  4, 90,173, 22, 90,173,198,122,214,162, 81,112, 48, 58,116,236,136, 43,151, 47,227,240,145, 35, 46,211,180,
-105,255, 66,161,  8, 94, 94, 94,240,241,241,129,175,143, 15,124,124,188,160, 44, 87, 70, 39, 36, 36,100, 58,213,231,234, 97,234,
-175, 13,231,115,203, 96,190,184, 16,101, 56,  6, 50,114,  5,200,128,127, 33,247,211, 41,120,113,249,247,144,138, 40, 64, 36,180,
- 28,238,112, 29, 55, 93,  1,133, 47,124,133,160, 77, 47, 64,175,215, 35, 40, 40,  8,229,229,229, 40, 47, 47,199,241,227,199,113,
-247,238,221, 74, 51,113,101,250,194, 66,188, 27, 40, 67, 35,175,146,186, 52,224,104,123,166, 26, 27, 27, 27,101,247, 44,170,218,
-179,104, 23,251,  5, 95,  7,  3,111,136, 25,  5, 46,107,254, 53,125,111, 90, 90, 26, 73, 79, 79, 39,245,252,222, 42, 66,128, 59,
-204,223,134,143, 63,254,248,194, 75, 47,189, 52,126,233,210,165,237,207,159, 63, 63, 64, 38,147,  9, 94,124,241, 69, 34,145, 72,
-192,113, 28, 25, 57,114,228,133,153, 51,103,118,235,210,165,203,206,201,147, 39,191, 62,121,242,228, 90,125, 81,  9,211, 18,184,
- 63, 47, 95, 59,213,165,107,183,215, 78,157, 60, 57,118,231,238, 95,151,100,159, 60,217,248, 82,206, 21,233,181,194, 92,254,199,
-149,155,101, 75,147, 63,237,116, 96,247,238,228, 54,173,219,236,242,  9,243, 62,178, 97,195,  6,214,217, 18, 29, 58,116, 40, 78,
-157, 58,213, 35, 37, 37,101,161,209,104, 20, 45, 90,180,232,179,157, 59,119,142, 43, 44, 44,124,232,140,195,169, 58,170,237, 65,
-240,205, 60, 40,129, 74,237,223,134,193, 33, 33, 88,129, 43,206,107, 29, 86, 19,255,149,211,151, 16,208,190, 17,134,253,240, 18,
-118, 76,220,174,176, 73,111, 54,230,111,211,254, 93,153,101,240,203,210, 30, 13,195, 97,  9,193,229,203,151, 97,107,172,213,205,
-203, 34,145,  8, 34,145,  8, 37, 37, 37, 24, 57,114,228,163,168, 39, 34,151,203,249,148,148, 20,244,233,211,  7, 70,147,  9,  6,
-163,  1, 70,107,112,147,193,104,113,  3,172, 94,189, 26,137,137,137,142,  6, 19,126,249,242,229, 96, 89, 22,167, 79,159,129, 72,
-104, 49,219,182,109,219, 22, 55,243,242, 80, 88, 88,136, 77,155,126,198,184,113,175,  2,  0, 95,205, 18, 80,235,  0,148,154,154,
- 42,  6,192, 36, 36, 36,112, 53,105, 64,174, 76, 85,180,105,254, 89, 89, 89,208, 85,232, 43,  5, 48,141, 86,  3,141, 70, 13,141,
-198, 61, 23,128,189,246, 63,110,220,184, 74, 11,128,171,130,192,184,113,227,170, 92, 71,200,229,232,208,209, 18, 20,119,229,242,
-101,220,180, 90, 60,198,141, 27,231,114,212,126,255,167,251, 67, 34,150, 64, 38,147, 65, 42,149, 66, 34,145,160,168,168,200,105,
-230,111,167,237, 55,104,  3, 28,187,108, 29,126,  1, 48, 98,233,255,129, 79,155, 13, 18,151,140,243,185,101, 32, 65,129,184, 94,
-160,177,104,255, 46,186,  0,236,250, 31,177,  9,  2,246,215, 14, 97, 48,  0,  2,139,178,247,151,121,223,194,232,205,102, 51,190,
-249,230, 27, 12, 30,252, 87, 92,216,193, 73,225, 64,177, 30,237,247,148,163, 71, 72,203, 26, 73,214, 16,229,110,239,242, 84, 56,
- 72,235, 44,195, 38,245,176, 40,212,101,141,112, 89,144,120,208,223,107, 21,  2,234, 61, 11, 96,233,210,165,155,102,204,152, 17,
-114,238,194,133, 56,131,193,208, 77,161, 56, 36,147, 72, 37, 66,138, 80, 56,116,232,144,111,167, 78,157, 54,196,198,198,254,107,
-236,216,177, 14,181,245,204, 67,251,185, 81, 47,141, 58,220,189,123,207, 57, 52, 99, 26,113, 61,231,218, 18, 46, 47,151,  1,192,
- 75, 65,153,187,182,105,159, 22, 26, 26,178, 71, 32, 20,255,248,239,121, 73,244, 23,139, 62,119, 88, 75,125,250,244,249,124,232,
-208,161,  0,128,146,146, 18, 28, 56,112,192,239,187,239,190, 91,  2,  0,167, 78,157,234,211,185,115,231,125, 79,132,  0, 96, 91,
-248,231,217, 31, 55, 58,210,236, 93,153, 18, 72,182,205,217,194,247,154,211, 15,193, 93, 27, 87, 50,253, 74,115,234,197, 34,156,
- 89,254,187,171,102,171,134,154,147, 74,  0,240, 29, 59,118,196,197,139, 23,171, 48, 22,149, 74,149, 11,160,181,139,210,252,131,
-180,  4,220,247,155, 63,254,240, 35,140, 70, 35, 76,180,  9, 52, 77, 99,249,242,229,117, 45,146,195, 47, 95,190,188,242,130,227,
- 88, 72,101, 62, 48, 24,140,184,124,233, 18,132, 34, 17,204, 52, 13, 47,111, 47,108,218,180,  9,  2,129,  0,113,113,113,120,246,
-217,103,249,178,178,218,  3,188,150, 47, 95,190, 47, 33, 33,129, 78, 77, 77, 13,181,149, 77,181,117,  0, 92, 50,109,206,153, 51,
-  7,199,142, 29, 67, 69, 69,  5, 42,116, 58,104, 53, 26, 43,243,215, 64,171,209,162, 66, 91,  1,157,221,128,239, 76,217, 69, 70,
- 70,242,217,217,217,149,218,127, 77,211,  0,157, 93,  4,200, 58, 23,191, 74, 93,216,152,190,205,247,232,202, 42,133,182, 21,254,
-  0,192,199,203,  7, 82,153, 20, 90,173, 54,218,230,218,113,131,249, 63,144,249,218, 54, 33, 96,204,210,239,192,111,  5, 26, 77,
- 74, 69,230,123, 49, 24,152,244, 19, 32, 18,193, 91, 90, 63, 63,103,117, 65,  0,  0,198, 29, 27,231,224,173,123,232,186,207, 11,
- 69,191,234, 81,190,248,175,187,102,179, 25,131,  6, 13,  2,  0,132,  7,202,240,223,212,230,248,116,217,109,124,117,198,224, 72,
- 35,182,159, 22,135,218,254,183, 75,155,233,198,152,213, 80,115,235, 27,194,231,255, 32,191,183, 82,  8,104,136,246,247,229,151,
- 95,126,249,198,164, 55,246, 62,213, 59,178,143, 86,163,  9, 98, 88,198, 20, 22, 22, 86, 18, 30, 30, 94,164,209,104,206,143, 29,
- 59,214,233, 65,225,215,237,191,114,  0, 54,189, 54,225,173,172,  1,  3,  7,110,151,201,100,254,  4, 60, 71,  8,  1,199,241,106,
-131,174, 92,113,245, 66,190,214, 91, 34,118,106,156,183, 49,127,192, 18, 72, 93, 61, 80,111,217,178,101,255,122, 34,  4,  0, 43,
- 83,119, 88, 97, 59,118,236,112,185,177,158, 89,254, 59, 15,  0, 54, 65,192,142,241, 55, 36, 67,119,187, 35,117,237,218, 21,167,
- 78,157, 66, 73, 73,165,137,176, 53,  0,216,152,223,196,137, 19, 31,117,125, 85, 41,163,148,148, 20,254,181,137,175, 97,245,234,
- 53, 86,159, 57,131, 57,115,230,212, 57,125,201,197, 21,244, 44,154,211,193,131,142, 54,155,232,184,124,249,242,107,  9,  9,  9,
-197,169,169,169,130,132,132,132,202,128, 64,235,180, 64,167,  7, 58,155,198, 60, 96,192,128,  6, 47,187,200,200, 72,222, 94,139,
-183,143,  1,112, 99,  5, 64,  2,128,223,180,105,211,125, 90,190,213, 66,224,114,123,222,180,105, 19,113,213, 98,224, 12,234, 50,
-253,187, 42, 44,140, 93,182, 14,176, 91,248,103,200, 71,127, 77, 71,214, 53, 84, 69,217, 89,  0, 28,173,  4, 88, 56,160, 16,133,
-  0,122,125, 26,136,197,167,219, 33,  4, 64, 73,174, 14,109,218,180,177, 48,141,197,129,120,238,169, 16, 68, 60,151,227,172, 70,
-236,180,123,211,154,150,184, 59,222, 52,208,152, 87, 47, 90, 15,233,123, 27, 12,235,214,175,187,  6,224, 90, 67,209,251,241,167,
-111,243,208,  0, 81,161, 13, 25,152,103,197,172,135, 81,158, 15,123, 51, 32, 50,122,244,232,168, 29,203, 31,203,189,  0,  8,  0,
-254,169,167,158,194,158, 61,123,140, 86,166,207,  1,240,122, 64,150,135,122,195, 22, 36,152,152, 56,141,183,106,254,143, 36,111,
-115,230,204,105, 89,147, 89,210,110, 26,161, 43,218, 14,121,192,117, 92,153,159,250, 46,251, 91,219,170,124,174, 50,113, 71,107,
-251, 55,  4,234,227, 18,152, 59,119, 46,110,220,184,209, 96,121,113,102,121, 95, 87,113,230,131,114,156,129, 37, 48,116,112,172,
- 12,191,157,104,135, 48, 47, 31,252,153,125, 15,237,157,100,254, 78,180,191,199,117, 57, 92,242,128,222,245, 44,207,238, 28,154,
- 54, 48,189,228,135,149,241,135,190, 27, 96,117, 11,131, 27,150,132,  7, 46,  4,140, 28, 57, 82,250,132, 53, 64,183, 52,251,134,
-250,237,212,212, 84,219, 10, 53, 76, 66, 66, 66,125,167, 50,121,208,240,204,191, 94,117,145,148,148,212, 32,117,153,154,154, 42,
- 76, 24,152,240,192,219,197,145, 52,  3,142,164,229, 60,246,125,214,211, 50, 61,120,228,141,208,221,125,132, 61,240,192,  3, 15,
- 60,240,192,131, 39, 23,148,167,  8, 60,240,192,  3, 15, 60,240,192, 35,  0,120,224,129,  7, 30,120,224,129,  7, 30,  1,192,  3,
- 15, 60,240,192,  3, 15, 60,240,  8,  0, 30,120,224,129,  7, 30,120,224,  1,  0,156,  4, 80, 98, 61, 63,145,168, 50, 11,224,220,
-185,115,110, 71,166,214, 20, 76,232,161,231,161,231,161,231,161,231, 36,189, 58,167,137, 62,  6,244, 60,245,235,161, 87,133,249,
-159, 61,123,118, 24, 96,217, 96,146, 16, 98,124,220,190,215, 99,  1,240,192,  3, 15,224,239,239, 79,249,251,251, 19,127,127,127,
- 17,  0,193,227,150, 63,219,190,243,118,251,207,215, 23, 53,173,143,239,193, 99,132,255,251,191,255,139,122,194, 63,161, 15,  0,
-219,178,195,162, 39,245, 35, 60,  2,192,223, 28,245,216,110,221,101, 12, 27, 54, 44,202, 58,232, 86, 30,214,123,127, 75,122,143,
- 57, 72,203,176, 48,  2,  0,106,181,154, 83,171,213,188, 90,173, 54,  3, 96,221, 33,246,246,115, 93, 11,166,140,232, 58, 26,  0,
-166,140,232,250,195,219,207,117, 93,  3,  0,115,198, 60, 69,230,188, 28, 41,122,123,120, 23,183,214, 20,177, 95,138, 54, 45, 45,
-173,202,230, 59,245, 97,254,118,237,190, 33,215,218,175, 47,205,134,166,247,196, 50,255, 61,123,246, 40,254,  6,159,194,160,225,
- 86,116,172, 21, 77,130, 37,164,109,227, 80,170,133,188, 25,  9, 11,  8, 22,120, 75, 68, 13,246,123,194,191, 73,155,162,  0,200,
- 96, 49,199,112,240,160,138,  0,224,196,222, 42, 38,  0,146,250,254, 84, 70, 70,  6,146,147,147,171, 44,255, 55,107,214, 44, 91,
- 71, 39,238,208,227, 54,  7, 86,173,232, 87, 50, 30, 23,122,143,125,213, 71,120,203,248,136, 86,114,  0, 64, 17,205, 76,104, 44,
- 22,254,100,123,120, 69, 83, 33, 41, 42, 45,165,157, 33, 52,121,120,151, 28,150,229,195,159,238,223,200,175,125,251,  1,251, 37,
- 18,234,214,180,164, 62,255,254, 15,185,136,123,106,253,255,137,132,228, 87,128, 92,  2,208,217,213, 76, 86, 95,138,182,158,203,
-205, 86, 97,254,118,109,223,221, 65,154,184,120,255, 97,211,123, 98,153, 63,199,113, 32,132, 96,240,224,193,252,145, 35, 71,136,
-139,117, 44,  6, 96,110,136,252,  4,  5,  5, 77, 81, 42,149, 95,187,249,186,  4,128,209,206, 18,208,160, 24,208,173,  7,121, 45,
- 60, 66,168,106,209, 72, 16,218, 49,156, 18,146, 80,162, 87,171, 57, 41,194, 88,170,103, 51,246,245, 81,195,217,250,254,134,179,
-  2, 64,  8,128, 72,  0,217,176,  4, 61, 60, 78,240,  3, 48, 20,192, 24,  0,219,  0, 28,  0,160,105,  0,186, 63,  3,120,181,129,
- 24,236,163,147,140, 40,135, 70,158, 62,214, 14, 21, 10,160,216,221,129,119,230,204,153,104,209,162,197,125,219,133, 38, 39, 39,
- 71,231,231,231, 43, 86,174, 92,233,202, 32,204,175,159,238,141,248,129,247,111, 46,195,109, 14,196,134,255,210,152,180, 74,247,
-200,232, 45, 95,190, 60,234,195, 15, 63, 84,196,197,197,225,231,159,127, 38,  0,240,206, 59,239, 68,173, 93,187, 86,209,162, 69,
- 11,112, 28,  7,131,193,128,168,168, 40,108,221,186,213, 33,205,117,203, 63,139,106,255,225, 22, 69, 70,175,102,209,243,179,211,
- 51,  1, 96,205,194, 53, 81, 87,231, 51, 10,182,133, 31, 52,156, 55,202, 13,126, 40,246, 63, 21,125,242,198, 39,153,142,232,181,
-106, 22,214,184,133, 88,118,119,250,180,137,166, 48,153, 88,172, 81, 26,200,242,239, 54,254,244,209,212,215, 16, 40,147,241, 70,
- 51,203,127,178,250, 59, 83, 81,105, 41,105,220, 56, 88, 88, 84, 84, 86,107, 35, 57,179,237,229,182, 59,118,222, 14, 24,240,116,
- 72,114,207,222, 65,162,245,235,175,203, 67, 26,201, 74, 63,127,239, 68,242,140,151,122,176, 79,247,111,148,149,115, 77,155, 63,
- 41,190,245,200,111,246, 95,172, 15, 83,172,175, 38,197,215,100,241,170,167, 16, 80,219, 59,238,230,181,161,233, 61,177,204,127,
-214,172, 89, 24, 60,120, 48,255,223,255,254,215, 29, 82, 52, 44,102,119,166,  1,178, 85, 20, 20, 20, 52, 70,169, 84,110,115,227,
- 93,127,171,210, 25,  8,224,110,124,124,124,  0,128, 41,214,107, 27,238,  1,248,117,195,134, 13,185,206, 18,253, 98,237, 23, 20,
- 93,106, 18,209, 38,163,180, 28,102,169, 72, 36, 20,106,140, 82, 74, 44, 54,112,  2, 63,111,134,150,153,205,194,162, 59,166,239,
-191, 89,111,124,125,242, 36,182, 62,109,199, 25, 23, 64,115,  0, 63,  0,136,177,158,155, 63, 70,109, 42, 24,192, 38,  0,207,  3,
- 56, 14, 96,132,245, 58,184,  1,104,191,  2, 39,252,165, 15,211,196,254,128,208, 15,192, 85,  0, 17,238,104, 35, 54, 19,186, 61,
-243,159, 53,107,150,194, 78,243,175,124,230,140,185,221,150,198,158, 89, 83,175,148,131,122,165,188,242,218,246,236, 81,208,  3,
-128, 19, 39, 78, 40,164, 82, 41,178,178,178,238, 19,182,242,243,243, 73, 65, 65,  1,233,215,175, 95,244,238,221,187,157, 42,195,
-198, 39, 46, 41,120,169,  8,221, 74,196, 85,180, 97, 66,241, 88,147,255,  6,249,161, 32,142,200, 71, 92,140,102,238,188,224,208,
-108, 26,213, 74,206,183, 16,203,238,190,255,238,  4, 83, 51, 31,177, 88,125,233, 24,241, 42,190,128, 25,131,218,162,105,128, 12,
-197,103,142,146,123,167,143, 81,179,166, 76,164,163, 90,201,249, 14, 94,190,230,186, 52,152, 70,141,196, 67,196, 98, 74,122,252,
-248,221,153,167, 78,222,233, 24,214,172,149, 57,160, 81, 51,226,235, 11,175, 86, 17, 94, 17, 65, 65,146, 54, 28,207,155,118,157,
- 44,214, 61,194, 54,204,219, 51,123,219, 81, 67, 31,229,157,165, 85,237, 92,253,168, 41,221,195,162,247,196, 50,255,221,187,119,
- 43,  8, 33,160, 40, 10,217,217,217, 56,122,244,168, 91,180, 88,150,189, 96,181,  0, 52, 68, 60,139, 76,169, 84,110, 11, 10, 10,
-122,217,141,119,205,214,250, 50,197,199,199,135,  1, 88,113,240,224,193,127,103,100,100,188,111, 59, 14, 28, 56,176, 92,161, 80,
-228,196,199,199,207,119,134,224,172,185,179,132,165,119, 74,188, 12,188, 41,128, 23,146, 80, 94, 34,105,204,137,196,141, 57, 66,
-133,114, 68, 24,194,  8,  4, 65, 28, 71,252,117,132,245, 97,196,148,236,155, 99,123,132,210, 23, 67, 31,168,  0,240,  5,128,131,
-  0,102, 88,207, 95,212,163,176,  3,  1, 44,  0,176,219, 90,112,187,173,215,129,110,210, 59,  2, 96, 15,128,  4,  0,107,  1,252,
-195, 74,243, 72, 61, 27,133,191,245,236,221,  0, 26, 54,172, 26,246,  2,235,249,113,195, 83,  0,142,  1,104,108, 21,158, 94,115,
-229,229,140,140, 12,133,189,217,127,214,172, 89,138,228,228,228,232,228,228,228,104,123, 33, 32, 57, 57, 57, 58, 35, 35, 67,225,
- 12, 61,123, 51, 61,245, 74, 57,174,237,153,136,107,123, 38, 86, 97,218,220,230, 64,184, 75,207, 42,228, 16,119,232,165,164,164,
- 68, 29, 63,126, 28, 19, 38, 76, 64,126,126, 62, 18, 18, 18,162,106, 74, 35,149, 74, 21, 77,154, 52,113, 88,126,169, 41, 41, 81,
- 77,142,255,129,130,  9,  3, 32,206, 87,227,235,  5,159, 71, 85, 87,142, 83, 82, 82,163, 68,198, 22,138,160, 38,  6,135,204,127,
-202,228, 87,232, 79,102, 78,228,197,183,206,136,  3,239, 93, 36, 23,239,106, 16, 30,226,141,167, 59,133,161,169,234, 42,110,104,
- 13, 16,114, 60,  2,136, 64,244,207,183, 38,240,211,223,121,243,106, 84, 43,121,173, 76,167, 92,165, 13,234,211,199, 39,185,107,
-191,231,205,190, 65,173, 37, 62,  1,161,156,204,199,219, 20,212, 40,216, 24, 18,222, 92, 88,174,212, 74, 52,106,  6,229,106,147,
-211,131,144,213,207,239,144,113, 58, 25, 15,112,159,230, 95,147, 80,238,130, 16, 64,106, 56, 87, 63,106, 74,231, 20, 61,126, 75,
-224,125,135,139,244,158, 56, 80, 20,197,239,221,187, 87,193,113, 28,222,123,239, 61, 16, 66,112,244,232, 81, 88,182,222,229,136,
- 27,244, 64,211,244, 89,171,  5,160,190,110,108, 37,  0, 40,149,202,173, 65, 65, 65,209,238,240, 79,154,166,133,  0,190, 62,112,
-224, 64,252,162, 69,139,238, 16, 66,196,182,  3,128, 40, 56, 56,152, 28, 58,116,104, 94,124,124,252,116, 71,  4,  5, 68, 36,161,
- 25,222,207,100, 50,135,178, 28,215,140,229,184,  8,150,144, 22, 16,  8,130,  9, 33,  1, 32,  2, 63,142, 71, 16, 79,115,  1, 26,
-131,217, 59,212,143, 17, 80,125,180, 15, 76,  0,  8,183,106,252,159,194,178,219,231,167,214,235,112, 55,126,107, 34,128,124,107,
-  3,159, 11, 32,200,122, 38,214,251,174,238,181,251, 47,  0,215,  1,172,177,154,131, 36,214,  6,241,149,245,126,125,246, 95, 30,
- 12,139,171, 99, 72,  3,245,129, 55,  1,204,183,158, 31, 55,116,  6,176, 29,192,179, 86, 75, 74,103,119,  9,217,152,191, 61,211,
-183, 23,  2, 92,110,156, 86,230,111, 67,117, 33,192, 29,122,213,  6, 88,226, 42,189,195,135, 15,131,166,105,244,238,221, 59,186,
- 67,135, 14,200,203,203,171,252, 62,142,227, 32,151,203,249,121,243,230, 41,142, 31, 63,142,145, 35, 71, 58, 28, 80,140, 89,167,
- 64,209, 12, 84,189,229,209,166, 14,193,184,190,238,240, 95, 76,139,227, 49, 77,190,142, 63, 60, 47, 88,113,243,184, 63,134,189,
-113,205,241,  0, 69,  9, 42, 74, 46,102,113, 69, 42, 35,202, 42,104, 62,166, 71, 11,222, 95, 38,198, 29,149, 14, 37,106,  3,226,
-122,182,224, 41, 66,248,223,127,221,  7,245,145, 19,252,153,109,187,110,213, 69, 46,235,108,211,105, 33,161,126,173,155,182,136,
- 96,188,100, 92,235,193,207,199,249,180,234,157,240, 66,227,118, 47, 14, 11,106, 26,217, 93, 89,209, 56,198, 76,155,205, 55,114,
-117,126, 78, 50,127,222,217, 45,104,211,210,210, 20, 14,102,  6,212,248,204,  9,151,156,103,118,192, 67,212,252,121,158,135,217,
-252,151,203,126,224,192,129,182,254,226, 46,227, 50,139, 68, 34, 51,199,113,199,173, 90,120,125,132,128,208, 74, 73, 64,169, 84,
-  4,  5,  5, 37,184,240,110,185, 74,165,146, 28, 62,124,248,181,  3,  7, 14, 60,255,253,247,223,151,205,155, 55,175,197,198,141,
- 27,209,174, 93, 59,  0, 64,203,150, 45,161, 86,171,201,194,133, 11,139, 15, 29, 58,244,121,124,124,252,192, 58, 41,114,140,148,
-101,153, 32,150, 97,155,153, 89,115, 27,  1, 69,154,138,133,148, 72, 42, 18, 24,132, 94, 98,149,183,175, 64, 35,144,242,140, 84,
- 32,240, 22, 50,180,223,205, 51,103, 37, 19, 67,190,112,187, 61, 59, 18,  0,158,179,106,135,246, 56,102,189,239, 10,198,  3,120,
- 15,128,220,202,  8,255,  0, 80,110, 61,207,183,222,127,207,154,206, 25,120,193,226,107,137,183, 94,155,236, 14, 88,239, 79,193,
-253, 91,249, 58,139, 87,  0,124,103, 61,215, 23,111,  0,152,102, 45,179,105,214,235,199,  5,109, 96,  9,154,220,  5, 32, 17,192,
- 84,  0, 81,158, 97,171,118, 20, 22, 22, 42,250,246,237,139,169, 83,167,102,246,237,219, 23, 39, 78,156,192,218,181,107,163, 26,
- 55,110,172,160, 40, 10,121,121,121,164,180,180,148, 76,159, 62, 61,250,200,145, 35,138,201,147, 39,215,217, 57,251,223,188,163,
- 40,234,219, 17,  9, 83,167,102,254, 25,198, 70,119, 86,  7, 41, 82,215,166, 70, 89,164, 19, 96, 77,222, 27,100, 83,105, 12, 25,
- 60,189, 48,250,104,154, 92, 17,253,244,167,181,214, 79,  1,205,172,248,250,235,141, 65, 91, 47, 20,222,222,120, 38, 95,181,238,
-248, 13,221,205, 34, 35, 79,241, 20,140,122, 22, 37, 37, 52,178,243,203,217, 29,121,133,218,221,119,138, 84,191,220, 42,184,114,
-172,168,120,248,109,147,249,179,218,104,250,  5,134, 55, 51, 84,148, 55,237, 20,249, 12, 69,147,150,131, 11,175,108, 55,  4,  6,
-121,203, 90,117,236, 81,194, 51, 37, 23,136,192, 47,132,227, 56,193,189,123,  6,103,172,120,188, 45,226,223,142, 17, 87, 55,131,
-219, 95,195,154,158,119, 66,195,174,212,244,109,135, 51,233, 61,120,176,168,168,168, 80,  0,128, 80, 40,196,236,217,179,145,157,
-157, 13, 55,253,254,246, 48,  1, 48,153, 76, 38, 83, 97, 97, 97,  6,234, 23, 16,168,173, 98, 14, 80, 42, 83,131,130,130, 70, 57,
-249,174,212,104, 52,134,207,153, 51, 39,249,157,119,222,209,119,237,218, 85,  2,  0, 11, 22, 44, 64, 78,142,101, 55,202,126,253,
-250,129,227, 56, 12, 28, 56, 80, 50,126,252,120,237,149, 43, 87, 14,189,241,198, 27,125,188,188,106,102, 77, 28,199, 51,153,  7,
- 15,238,205,203,187, 49,158, 53,179,141,  4, 34,153, 73, 64,164, 58, 74, 34,214, 83, 82, 47, 45, 45,242,170,  0, 37, 81,115, 82,
-214,172, 85,151,249, 40,118,158, 27,197,158, 58,235,118,  0,183, 35,  1, 96, 56,128, 67,213,238, 29,178,222,119, 22,  2,  0, 31,
-  1,136,  3, 80, 86, 75,154, 50,235,243,143,224,156, 95,103, 60,128,253,  0,212,181, 60, 87, 91,159,143,119,163, 76,158,129, 37,
-134, 96,153,245,252, 76, 61, 26, 87,140,213,106,210,207,154,159,126,214,235, 24, 23,233,  4,  2,  8,112,226,112,213,149,210, 31,
-150, 85,172,108, 65, 72,183,172,150, 30,183,226, 60,170,107,252,213, 45,  2,174,130,219, 28,136,182, 35,127,168,188,110, 59,242,
-135,251,162,248, 93,165, 87,141,153,240,174,208, 91,189,122, 53,159,157,157,192,140,  1,163,  0,  0, 32,  0, 73, 68, 65, 84,141,
-211,167, 79,163, 89,179,102,252,111,191,253,  6,141, 70,131,203,151, 47,223,167,209,126,244,209, 71,153,157, 58,117,138,222,178,
-101, 75,173,244,190, 89,189,154,111,158,125, 17,161,167,115,160,104, 54,146,239,122,149, 81, 80, 26, 51,216,203, 21,247,165,125,
-255,163,183, 50, 91, 68,158,142,190,245,199, 43,181,106,207,215, 11, 10, 62, 40,160,153, 21, 37,165,  6, 57,109, 96,  3,115,238,
-104,124,118, 95, 41, 44, 51,181,236,142, 78,161, 65,  0,128,221,231,238,  9,115,139, 42,252,  0,  4, 22,209,198, 78,183, 77,230,
-216,220,194,194, 15,106,163, 57,228,133, 56,170,195,224, 37, 93, 25,221, 31,249, 45, 58, 14,149,137, 68, 44,125,253,143, 12, 85,
- 97,254,229,123,197,249,191,231,107,148,133,  0, 69, 17,165,150,246,159, 18,215,211, 81,187, 33,177,177,177,213,153,113,117,179,
-186,253, 53,172,233, 31, 86, 52,190,  7, 13,136,193,131,  7,243,135, 15, 31,  6,183, 57,  0, 60,207,227,243,207, 63,199,145, 35,
- 71,108,130,154,219,117, 80, 94, 94,110, 34,132, 12, 58,117,234,148, 49, 60, 60,124, 88, 61,173, 58,  1,128,101, 54,128,245, 60,
- 17,  0, 23, 20, 20,228,140,162,102,108,220,184,177,122,223,190,125,111,110,220,184,209,255,232,209,163,226,161, 67,135,170,109,
-204, 31,176,108,119, 47,145, 72,112,235,214, 45,106,239,222,189,126,129,129,129,119,  7, 12, 24,144,203,113, 53, 79, 86,107, 27,
-209, 78,219,175, 95,191,152, 75,151,254,124, 70,163,211, 54,230, 25, 51,  3, 10,102,198, 68,153, 76, 38,147, 65,131, 34, 13,103,
- 50,106, 11,243,139,152, 93,187,247, 36, 53, 10, 14, 41,166,105,189,219,179, 16,168, 26, 58,  6,101, 61,154,194,226, 23, 62,108,
-119,143,178, 94, 55,182, 62,183,221,171,171,131,206,128, 37, 64,239,102, 53, 58,213,143,155,214,116, 51, 28,208,163,  0,140,  5,
-240,189,  3,122,223, 91,211, 81, 78,208,179, 29,173, 96,137,115,248, 24,150,153,  4, 31, 91,175, 91, 85, 75,231, 12,189,241,  0,
-222,177, 50, 89,131,245,158,193,122,253,142,245,185, 51,244,226, 97,137,115,112,246,136,119, 34,127,159,  1,248, 15,128, 81,214,
- 50,167,  0, 72,  1,156,176, 90,101,250,  2, 72,178, 62,175, 43,127, 24, 54,108,216,125,190,126, 91, 16, 96,245,216,128, 97,195,
-134, 57, 20,  6,134, 13, 27, 22, 93,221, 55,223,118,228, 15,247, 49,127,234,149,114,184, 75,207,166,101,186, 74,239,220,185,115,
-104,209,162,  5,238,221,187, 71, 10, 10, 10,200,221,187,119, 73,255,254,253,239, 11,  6,172, 52, 83,121,121, 41,164, 82,105,173,
-244,228,231,206, 65,213,162,  9,122,220, 59, 65,162, 11,246,144,151,238,110, 38,103,125,138,163,217, 44,117,141, 76, 62, 63,135,
-134, 68, 90,183,178,115,189,160, 96, 78,  1,205,196, 20,208,204,138,219,180,249,243,115, 55, 75, 66,244, 12,  3,181,209, 98, 28,
-187, 84, 82,130,155, 70,122,195,109,147,121,205,109,154,249, 34,183,176, 48, 29,117, 76,157,109, 42,239, 48, 39,160,105,191,208,
-210,252,  3, 90,134, 49,149, 23, 22, 73,155, 93, 56,113,202,255,242,185,243,109,242,110,177, 61,111,223,188, 13,177, 72, 24,218,
- 57,204,123,188, 74,107,110,227,168, 62,210,210,210, 72,108,108,172, 83, 66, 97,108,108,108,116, 90, 90,154,203,140,194, 62, 16,
-240,113,158,161,243,119,198,144, 33,131,249,204,204,204,202, 24,135,253,243,124,193,243, 60,  6, 15, 30, 92, 31,211, 63,172, 76,
- 58, 26,  0,158,126,250,105,125, 53,193,209, 45,121, 34, 40, 40,104,130,157,114,106, 82, 42,149,187,149, 74,229,186, 58,222,177,
-165,229,  0, 84,132,133,133, 93,120,233,165,151, 86, 47, 93,186,212,235,252,249,243,254, 50,153, 12, 47,190,248, 34, 36, 18,  9,
- 56,142,195,200,145, 35, 43,102,206,156, 25,208,165, 75,151, 43,147, 39, 79,238, 60,121,242,228, 50,163,177,230,133,  3, 19,166,
- 37,112,127, 94,190,118,170, 75,215,110,175,157, 58,121,114,236,206,221,191, 46,201, 62,121,178,241,165,156, 43,210,107,133,185,
-252,143, 43, 55,203,150, 38,127,218,233,192,238,221,201,109, 90,183,217,229, 19,230,125,100,195,134, 13,110, 79,  7, 20,214,160,
-173, 71,  2, 24,  0, 96, 17,128,233,214,193,210,187,154,217,238,  7, 88,252,236,159,192,226, 18,200,174, 67,192,120,202,170,253,
- 58, 99,142, 63,110,181, 46, 80,117,208, 11,  1,208, 18,192,105,  7, 52, 79, 91,211,133,162,246,169,139, 20, 44,129,121,129, 86,
-198,249, 18, 44, 83,255,114,172,180,115,172,215, 27, 97,241,147,111,128,197,117, 65, 59,160,247, 10,128,111,  0,116,  0, 80, 84,
- 45,159,119, 97,  9, 90,188, 98, 77,187,217,  1,189,247, 96,153,221,160,119,162,252,188,  0,236,  3,240,147,131,250,120, 25,192,
-191,173,231,179,118,249, 19, 89,235, 50, 13,192, 42,  0,139,173,207,239,214,246,131, 25, 25, 25,153,  0,144,159,159,175,176, 69,
-251, 87,215,250,243,243,243, 21,246,105,235,130, 45,205,134,255,210,149,209,249,213,181,244, 13,255,165,241, 40,232,101,101,101,
- 97,208,160, 65,184,114,229,202, 95, 76, 92, 46,143,222,178,101,139,162, 85,171, 86,209, 28,199, 41, 90,182,108,201,219,166,  1,
-238,218,181, 11,145,145,145,209,123,247,238,173,145, 94,251,172, 44,252, 28, 28, 90,165,172, 58, 38, 14,135,238,211,219,192,179,
-161,224, 57, 96, 90,203,239,248, 10,206,  7, 74,131, 31,148, 57, 65,232, 62,104,103,244,229, 95,234, 54,179, 95, 47, 40,216, 10,
- 96,107,235, 22, 77,219,  3,248,135,137,229,144,126, 33, 15,131,194, 44,238, 78,194,243, 90, 45,195, 44, 42, 46, 46,190,231,  4,
- 51,253,148,231,121,239,156, 43,202,215, 84,167,183, 52, 42,190,171, 68,241, 61, 45,132,194, 50,239,138,114, 30, 42, 13,203,135,
-134,136,  3,132, 28,198, 24, 76,236,207,139,222,123, 58,224,147, 47,142,171, 28,  8,  1,153, 78, 12,216,164,154,187,192, 53, 12,
-181, 90, 94, 14,196,185,250,166,205, 26,230, 40, 42,223, 62, 29,113,150, 30,137, 43, 71, 61,233, 61,  9,224, 51,167, 93,  4,210,
- 45,147,177,246, 95, 96,176, 78, 97,233, 99, 46,206,249,175,181,109,  8,  4,130, 16,161, 80, 88,124,252,248,241,111,159,126,250,
-233,250,148, 89, 11,165, 82,185,198, 42, 88,188,162, 84, 42, 55,219,206,117,188,179,  9, 22,151, 41,111, 29,187, 43,150, 46, 93,
- 58,125,198,140, 25, 77,207, 93,184, 48,212, 96, 48,248, 42, 20,135,136, 68, 42,  1, 69, 40, 28, 58,116, 72,212,169, 83,167,179,
-177,177,177, 35,199,142, 29, 91,225, 40, 67,153,135,246,115,163, 94, 26,117,184,123,247,158,115,104,198, 52,226,122,206,181, 37,
- 92, 94, 46,  3,128,151,130, 50,119,109,211, 62, 45, 52, 52,100,143, 64, 40,254,241,223,243,146,232, 47, 22,125,238,118, 65,214,
- 36,  0,252,195, 42,225,188,  0,224, 50,  0,159, 26,222,219, 99,213,216, 99, 96,153, 71, 30, 95,135,249,191,173,181,192,156, 17,
-  0,202,172,233,  5,117,208,139,  2,112,205, 73,122,215,172,233,127,169,131,222, 20,  0,147,  0, 92,  4, 48,211,250, 93,246,180,
- 21,  0,242, 96,241,223,239,  6,176, 30,150, 25,  7,181,209,155,104, 45,143, 30, 86, 43, 66, 77,249,212, 88,159,167, 88,133,128,
-245,117,208,251,222,218,208,188,156, 28,188,190,119, 80,126,159, 89, 45, 27,251,173, 66, 13,170,209,254, 13, 64, 39,107, 93,228,
- 88,  5, 41,135,166, 93,235, 60,127, 69,  3, 45,  4, 68, 38,173,210,241,147, 86,233,106, 88,184,167, 28,143,138,222,159,127,254,
- 73,254,252,243,207, 42,247,126,250,233,167, 76,  0,100,243,230,205,  0, 64,110,221,170, 26, 83, 87, 27,243,  7,128,230,127,254,
- 73,128,170,244,222, 94, 50,203,194, 28,151, 89,243, 84, 61, 68,239, 23, 23, 70, 97,150,207,131, 16, 16, 84,160,146,249, 91,185,
-250, 61,169, 84,234,148,217,144,231,121, 66,  8, 89, 48, 39,174,179, 87, 88,179,150,163, 56,120,181, 45,200, 47, 18,152,141, 42,
-190,113,168, 15,241,241, 22, 17,198,204,161, 92, 69, 51, 68, 70,100,106, 45,211,166, 14,133,160,182, 54, 91,253,255, 71,201,  0,
-237,221, 17,206,204,219, 39, 15,153,222, 99,207,252,185,205,129,216,127,193, 50, 69,127,189,130,198,207,199,105, 91, 76,  6,105,
-168,250, 97, 89,182, 12,  0,122,245,234, 85,175,  5,129,108,204,223,138, 82,235,217, 81,223, 72,180, 27, 79,205,  0, 10,  0,224,
-203, 47,191,124,249,141, 73,111, 12,123,170,119,228, 24,173, 70, 19,194,176,140, 49, 44, 44,172, 48, 60, 60, 60, 87,163,209,108,
- 27, 59,118,108,169,179,249,250,117,251,175, 28,128, 77,175, 77,120, 43,107,192,192,129,219,101, 50,153, 63,  1,207, 89,102, 78,
-240,106,131,174, 92,113,245, 66,190,214, 91, 34,174, 87, 64,107,117,  1,128,133, 37, 72,205, 25, 63,252, 41,235,193,162,246,229,
- 69, 89, 88, 34,234,157,157,175,169,128,101, 33,159,186,232,237,128, 37,104,205, 25,188,230, 68,254,190,  6,240,173,163,177, 31,
-192,187,118,239,212, 69,239,  7,171,197,192, 17,242,172,154,189, 51,249,115,101,190,235,215, 14,232, 61,235,  4, 61,155,181, 97,
-189,181,108,156, 49, 49,145, 97,195,134, 69, 85,143,250, 31, 54,108, 88,180, 51,154,122,109,244,236, 86,234,123,220,232, 61,246,
-184, 81,120,215, 68, 53,107,182,254,157, 79, 83, 38,217,238,209, 34,234, 39,163,158,219, 87,148,159,175,117,170,208,  8,225,255,
- 61,165, 31,249,248,235,223,231,236, 90, 21,186,237,196,201,187, 83, 67,252,185, 23,169, 32,191,  0,158,  7,  8,225, 77, 38,134,
- 43,226,128, 82,218,196,  5, 20,222, 53,184,228,143,180,154,249, 21,213,174, 31,151, 34,244,172,  4,232, 38,158, 91,172,125,208,
-223,200,  1,104, 34,149, 74,239,246,234,213,235,217, 51,103,206,212,155,160, 82,169, 60, 24, 20, 20, 52, 73,169, 84,174,119,242,
- 21,129, 53, 31,149,227,233,186,245,235, 50,  0,100, 52,212, 71,254,248,211,183,121, 86, 94,241, 64, 80,147,  0, 96,116,131, 14,
- 95, 71, 37,153, 60,244,254,182,244,170,192,202, 72, 73,181,123,110, 55,206,199,157,222,147,  0,165, 94,255, 38,224,101,  6, 16,
-194,129, 47, 52, 26,233,141, 69, 69, 37,231,225,194, 42,106, 31,127,253, 59,191,253,179, 17,228,133,233,251,178,  0,100,197,246,
-109,255,143,160, 32,201, 92,161,128,240,119,203,140, 87,239,210,204,  6,153,136,146,202,132,  2,129,153,225,164,174,228, 47, 45,
- 45, 45, 51, 54, 54,214,182, 15,128,205, 61,224, 58,103,173,238,235,183, 51,253,215, 35, 14,192,179, 18,160, 27,160, 94, 41,  7,
- 33,  4, 47,142,158, 82,227, 24,178, 99,123,106, 67,125,107, 17,  0,210, 16,204,223, 78,  8, 88,239, 66,114,153,117, 76,165,159,
-212,186, 18,214,208, 16, 27,114,142,172,135,222,223,155,158,  7,143,187,  0,160, 84,242, 74,165,114, 74,125,233,188,244,254, 62,
- 30,  0, 94, 27,220,137,252,120,228,210,231,  6,126,218,170,233,227,142,119,162,117, 36, 34, 72, 36,108,  4, 66,244, 62, 50, 97,
- 73,151, 14,126, 57,233,251, 93,163,109, 13,244,227,221,  9,248,123,192, 26,180,199,  2,224,198, 55,166,166,166,240,  9,  9, 83,
-201,142,237,169,127,247,238,229,111, 21,164, 37,110, 42,206,143,190,178,220,221, 71,216,  3, 15, 60,120,  2, 37,126,  1,224, 37,
- 33,224, 56, 30, 32,  4, 21,  6, 79,247,247,192,131,255,217,241,192, 83,  4, 30,120,240,191,  3,134,  5, 52,250,191,245,178,243,
- 30,120,224,129,147,160, 60, 69,224,129,  7, 30,120,224,129,  7, 30,  1,192,  3, 15, 60,240,192,  3, 15, 60,240,  8,  0, 30,120,
-224,129,  7, 30,120,224,193,223, 17, 85, 98,  0,206,157, 59,231,118, 52,106, 77,193,132, 53,209,123,225,153,200,168, 46,221,218,
- 40,154, 52, 11,143,214, 26,116,138,195,138,172,232,140, 67,231, 51,221,165,215,181,239,240,168, 30,221,250, 42,238, 21, 22,194,
- 91,230,141,219,  5,185,209,217, 39,246,184, 77,175,161,191, 55,113, 60, 21,213,175,111, 43,133,204, 91,  0,161,128,  2,145, 18,
-188, 56,238, 18,113,151, 94,194,255,203,138,122,170,239, 83, 10,127, 31,  1, 32,  4, 98,251,214, 60,199,233, 81,125,175,135,222,
- 99, 75,175,206,169,102,143,251,247,182,234,245, 50,239,199,229, 62,208,252,157,253,232,150,219,  3,105,207, 37, 45,239,187,247,
-121,163, 66,183,233,253,163,244,254, 13, 87, 61,237,249,161,208, 19,162,134, 41,178, 79,226,247,186, 44,  0,212,134,149, 81,104,
- 11,203,122,248, 44,128,220,153,153,184,233,236, 15, 12, 31,216, 42,138,128, 67, 72, 64, 16,178, 14,159, 81,124,152, 56, 17,  3,
-134, 14,  0,163,211, 43, 58,117, 24, 12,142,131, 98,198, 91, 79, 71,247,236,217, 13,215,175,223,130, 90,165,195,234,245, 71, 50,
-107,163,215,123,208,171, 81, 60,  8, 90,182,105,165, 72,120,127, 49,222,124,245, 57,252,240,159,175,  0, 72,177,231,124,  1, 40,
- 10,138,149, 11,230, 33, 39,231, 42,228,242,150,144,200,132,184, 83,144, 19, 13,125,205, 89,158,251, 92,119, 94, 44, 22, 67, 38,
-147, 33, 55, 55, 23, 77, 67,253,208, 72,232,131,166, 45,  2, 16, 40,243,135, 55, 97, 65, 81, 20,120,142,133, 94, 34,132,250,158,
- 26, 99,254,147,225,176,162,150,207,233,198,251,202,212,240, 11, 16,195,199, 91,  8,177,140,130, 80,  0, 80, 98, 33, 50,119, 69,
-242,102, 94,128, 97,163, 78, 56, 93,225, 93, 95, 90, 25, 21, 30, 30,142,102,173,155, 41, 12, 70, 19, 40,137, 12, 48,  3,211,146,
- 79, 69, 25,244, 58,124,247, 73, 84,230, 35, 20, 36,255, 86,243,152,159,112,184, 90, 23, 78,167,143,253,112,174, 55,128,167, 26,
-203,188,254, 93, 88, 88,216, 65, 36,149,128,243,242, 90,  6, 96,109,218,178,164,138,199,165,  0, 34, 58, 13,137,186,121,233,112,
- 77,251, 41,252, 45,218,104,106,106, 42,249, 97,195,134, 43, 18,177, 88,198,113,156,191,183,143,143,207,168, 23, 95,244,  2, 64,
- 39, 36, 36,240,143,105,158, 41,  0, 72, 72, 72,224, 26,128,156,159,191,191,255,172,246,237,219,143,149, 72, 36,205, 10, 10, 10,
- 10, 10, 11, 11, 79,210, 52,189,  4, 64,174, 27,244,  2,  2,  3,  3, 23, 63,243,204, 51,207,135,133,133,201, 79,157, 58,117,239,
-226,197,139,199,141, 70,227, 66, 88, 86,136,253,223,176,  0,212,194,252,  5,222, 18,225, 83, 19,  7,182, 94,193,241,188,241,232,
-213,123, 95,174,140, 82,239,159,153,137, 75,142,222, 85,222, 61,200,155, 42,148, 48, 87,168, 32,100, 41,252,113,233, 42, 94,127,
-125,102,229,115,138,  2,126,207, 90,143, 70, 45,194, 21, 92,133,  6, 52, 71,112,232, 80, 86,244,234,245, 71,106,161,216,146, 63,
-125,226, 18,136,151, 31,206, 92,202,199,249, 75,111,224,187,159,127,171,124,202,113,192,136,254,253,129,138, 34,  0,190,200,189,
-120, 25,162, 70,  1, 24,208,175,139, 66,165,175, 67,102, 33, 20, 64, 40,244,232,214, 11,141,189,197,104,218, 72, 10,191,224, 32,
-  4, 74,124, 17, 40, 21, 64, 36, 16,192,204,178, 80, 49, 28, 78,149,158,118, 88,168, 11,223,109,206,203,  4,229,240,243,242, 66,
- 72,163, 96,248,249,121,129,167, 88, 48, 92,  5, 88,176,240,241,241, 66,163,198,205,144,123,165, 29,223,186,195, 15,117, 14, 74,
- 61, 99, 86,241,254,190,222,240, 15,  8, 68, 72,163, 96,232,116, 58,136, 37, 82,136,140,150,197,249, 34,228, 45, 21,202,114, 21,
-158,121,107,125,116,126,193, 29,148, 23,221, 66,217,249, 84, 71,194,128,211,131,196,208, 73, 67,163, 15,172, 63,144,233,  4,173,
-  7, 42,  4,228,229,229,241,  0, 32,151,203,201,227, 66, 47, 60, 60,252,117,154,166,215,  3,192,216,232,104, 42,117,203, 22,119,
-  6, 95,203, 26,169,118,134, 28,158,231, 65,  8,169, 60,219,238,217,210, 57,216, 73,205,149,245,228, 93, 97,254,157,188,205,204,
- 86,223,  0,255, 14,  0, 32,150, 73, 65, 27,140,224,116,250,229,199,143, 28, 94, 16,251,225,220,142,105,203,146,242, 29,209,249,
-242,163, 68,222,170, 97, 49,176,184, 32, 57,235, 56, 84,227, 88,212,125,200,243, 24,242,220,255,185, 84, 71, 55, 47, 29, 86,180,
-233, 18, 21,125,253,143, 76,215,133,226, 88,165, 75,201,227,226,226,176, 37,246, 64,157,105,162, 15, 84,221,138,164, 83,128,229,
- 83,139,141, 28, 12,140,165, 94,117,214,115,106,223,  0,180,243, 21,213, 73,111,197,138, 21,153, 31,189, 55, 59,116,244,216, 49,
- 62, 70,163,  1, 43, 63,255,140, 90,189,122,181, 49, 49, 49, 49, 28,192,157,134,238,123, 99,198,140, 25,186,109,219,182, 12, 87,
-133,168, 73,147, 38,241,121,121,121, 40, 43, 43,195,210,165, 75,225,235,235,139,168,168, 40,200,229,114,172, 95,191,222,221,126,
- 55,184, 87,175, 94, 27,222,127,255,253,235,237,219,183, 95,223,179,103,207,203,247,238,221,107,150,149,149,213,235,205, 55,223,
-220,173,209,104,150,195,178,149,187,179,136, 30, 59,118,108, 90, 82, 82, 82,176,217,108,134, 76, 38,131,183,183,119, 19,157, 78,
-247,242,232,209,163, 71, 93,184,112, 33, 17,150,141,211,158, 56,156, 59,119,174,186,149,192, 57,  1, 96,101, 20,154,  3,104, 13,
-203, 18,135,172,206,196,220,206,186, 86,252, 69,255,182,161, 51,159,233,212,100, 65, 99,127, 89,211,149, 40,218,  4,224,234,204,
-204,218, 55,169, 49, 85, 40,209,184,205,179, 88,252,193, 88,172,183,227, 73,135,143,167, 64,167, 55, 97,228,208,153,120,122,192,
- 36,188, 26,247, 12,100, 50,  9,104,150,129, 86, 79, 43,106,111,100,183,  0, 26, 24, 59, 97, 45,222,126,127,106,229,221, 17, 79,
- 71, 65, 42,149, 96,251,161,223,176,231, 88, 22, 54,172,251, 10, 70,131,  9, 98,129, 16, 62, 94, 98,232,202, 10,162, 85,  5,168,
-113,135, 53,158,231,  1,158,179, 28, 20,  7,158,231, 97,162, 37,149,203, 59,240, 52, 11, 86,  0,176, 96,193,210, 28, 24,182,110,
-  1,118,206, 91,114, 62,208,143,129,159,175, 55,194,155, 69,160, 67,215, 54,240,245,145, 65, 93, 81,130,162,146, 34,148,171,239,
-193,108, 36,240,242,242, 66, 72,200,  0,148, 22,135,240,141, 66, 63,171,217,140, 63,120, 30,207, 24,244, 48,  8,  1,177, 84, 12,
-131, 94, 12, 90, 47,134, 81, 42,129,144, 48,224, 33,128,209, 80,  1,131, 94,139,102,205,154, 42,196,  2, 33,148,208, 32,148,158,
-128,234,107,204, 87,199,167, 27, 62,117,216,128, 62,136,255,160,238,177, 50, 54,182,202,254,238,177,177,177,189,131,130,130,114,
-  8, 33, 70,158,231,133,129,129,129, 94,185,185,185,193,214,213,221,154,186,219,144, 19, 19, 19,199,217,253, 70,148,187,171,197,
-213,200, 45,  9,225,167, 77,155, 22,189,122,245,106,151,104,134,135,135, 39,244,233,211,103,201,192, 30, 61, 96,150, 72,144,156,
-156,204, 77,125,229,149, 97, 41,155, 55, 31,112,241,247,177, 98,193,130,202,235, 89,243,231, 35,121,225,194, 58,175,157, 33, 91,
-141,185,243,189,123,247,  6,  0,126,232,208, 86,157,  1,220, 72, 74, 74, 51,184,200,252,179,186,118,238,236,103,235, 51,222, 82,
- 25,238,150, 20, 67, 83,174, 66,175, 62,125,189,118,125,183,238, 64,236,135,115, 59,167, 45, 75,114,180, 54, 59, 51, 99,201,106,
-225,107, 47,143, 18,182,149,203, 57,171, 16,128,249,201,171,170, 10,209,179,166,  3,  0, 62,122, 47,209,173,237,164,221, 98,254,
- 54,164,  5,185,144,120,168, 75,164,189,133,  4,231, 23,190,  5,226,215,  8,236,141,243, 48,221,248, 19, 57, 74, 29, 34,247, 22,
- 59,245,126,207, 94,189,142, 78, 25, 31,223, 50,126,242,155,  1,105, 63,253,204,201,229,114,106,113,210,114,248, 46, 88,140,237,
-219,183, 23,166,166,166, 82, 13,101,  5, 24, 51,102,204,176,109,219,182,237,223,182,109,155,237,122,184,237,127,  7,  2, 74,212,
-254,253,251, 21,183,110,221, 66,235,214,173, 49,104,208, 32,248,251,251, 67,165, 82,225,206,157, 59,184,121,243, 38,134, 15, 31,
-206, 15, 31, 62, 60,122,246,236,217,174,212,211,152,103,158,121,102,229,138, 21, 43, 54,245,236,217,115, 37, 33,228,142,221, 56,
- 78, 98, 98, 98,124,  0,100, 89, 15,167,232, 37, 38, 38,166, 79,155, 54,141, 58,125,250, 52,  8, 33,  8, 14, 14,174, 60,246,238,
-221, 43,238,215,175,223, 87,183,111,223, 62,241,164, 51,127,219,189,234, 66,128,176,  6,230, 31, 28, 25, 17, 28,223,163,101,208,
-  4, 66,136,136,231,121, 51,103, 57,104,214,108, 52,136, 41,174,105,215,198,210, 15, 26,249,181,110,179,237,212,205,159, 87, 70,
-113, 71,103,102,214,190, 91, 28, 32, 70,167,142,237, 65, 81,153,200, 81,149,  1,184, 12,117,225, 53,136,164, 18,236,216,253, 37,
-244,165, 44, 38,188,241, 15,112, 28,240,226,168,254, 96,133, 62, 14, 63, 46, 39,231, 50, 56, 14, 24,217,157, 88,249, 74, 75, 24,
- 77, 52, 98, 70, 12,135, 52,128,194,134,141,251, 64, 81, 64,250,207,235, 81,120,227,207,232,189,155, 86,100,214, 36,253,  0,  0,
-199,  3, 28,199,129,227, 56,176, 44, 11,147,136,135,153,152, 65,211, 52,244, 94, 70,128,147,130,226, 89,176, 98, 30, 21,180, 17,
- 58,141,186,206,188,133,248,152, 32, 20,202, 16, 28, 28,140, 54,109,218, 32,172,113, 95, 64, 64,129,101, 79,131,226, 85, 48,234,
- 24,176,156, 14, 69,119,148,  8,  9, 46, 69,112,192,  0, 44, 91,177, 43,234,231, 31,239,167, 37, 51, 50,224, 77,165,128, 81,  2,
-154, 50, 67, 39, 22,162, 66, 38,130, 80, 36,  6, 56,111, 16,  1, 65,133, 78,143,242,162, 91,200, 61,125, 12,202,252,124,112, 28,
-  7,138, 23,184,213,104,190, 91,251,151,224,252,230, 59,111, 58, 30, 39,171,174,217,110, 76, 75, 75,155,251,254,251,239, 79,205,
-207,207,167,  8, 33, 33,169,169,169, 63,195,178,185,147,151,187, 13,121, 74,108,172,104,205,154, 53, 27,239,221,187,135,244,244,
-116, 68,182,111, 47,104,136, 14, 34,151,203, 73, 92, 92, 92, 20,207,243,138,213,171, 87,187,188, 97, 17, 77,211, 41,  3,173,109,
- 74, 44, 22,163, 93,187,118,216,122,232, 80, 70, 72, 72,  8, 74, 74, 74,156,166, 99,211,236, 31,  0, 72,239,222,189,249,211,167,
- 45, 22, 43,187,243,159, 67,134, 12, 41,156, 59, 55,214, 63, 41,201,241,154,251,177, 31,206,245,246, 54, 51, 91,187,118,238,236,
- 39,160, 40,188,251,218,  4, 24,140, 38, 36,127,251, 45,188,100, 50, 24,141, 70, 24, 13,  6,116,239,217,163,237,111, 63,253, 52,
- 13,192, 23,142,172,142, 11,103, 77,231,  0, 80,215,242,242,168,234, 12,191,122,247,116,231,195,155,119, 24, 28,125,251,202, 17,
-126,216,139,111, 69,103,236,252,214, 45, 65,192,126,215, 62,219,150,182,117,221,119,132, 78,  1, 66,220,170, 96,113,120, 88,  8,
- 68, 51, 83,161,153, 16,  1, 97, 96,168, 75,204, 63, 46, 46,174,200,172,211,223,153,252,238,212,230, 31,254, 99, 14, 86,175, 75,
-185,212,167, 87,175, 86, 41,171, 82,188,222,155, 51, 27, 63,245,239,139,141, 27, 55, 78,132,101,215,210,250, 48,254,168,109,219,
-182, 41,108,204, 62, 53, 53, 53, 23,150,109,218, 15, 58, 35,  0,236,223,191, 95, 17, 18, 18,130,158, 61,123, 50, 20, 69,  9, 45,
-214, 89, 14, 34,145,  8, 65, 65, 65,104,220,184, 49,110,222,188,137,253,251,247, 43, 92,232,115,177, 47,188,240,194,103, 43, 86,
-172, 88,213,190,125,251,181,132, 16, 14,192, 87,  0,158,  3,112,132, 16,178, 16,150, 53,243,103,  3, 88,232, 12,189, 21,137,137,
-155,  7,198,198,146,157, 59,119, 66, 40, 20, 66,161, 80,224,252,249,243,104,211,166, 13, 22, 45, 90,132, 46, 93,186, 96,234,212,
-169,194,143, 63,254,120,197,147,200,252,167,204, 93, 86,121,239,235,164, 15,107, 20,  2,106,154,  5, 64,  9,  5,148,144,225,120,
-173,193,204,220, 33,132, 72,124, 36,130,110,126, 98, 68,202, 58, 15,105,141,232,183,129, 14,131,208,196,155, 31, 51,113, 64,196,
-135, 65,126, 94,195, 86, 70,193,191,246,236,112, 16,  8,108, 99,182, 31,128,102,240, 15,127,  1,  6,214,136,181,169,235,240,195,
-198,116, 12,143, 30,  0,  0,208,235,  1,129,176,118, 82, 50,175,246,  0,  0,150,181,223,155,166,  8, 64, 22, 40,129,  4,241,175,
-191,133,152,184, 56,236,218,109, 97,100, 94,222,128,174,226,110,157,133,101,134,160,146,249,155, 25, 22, 38,141, 25,122,149, 30,
- 42, 51, 13,165,158, 70,185, 73, 11,149,182,  2,229,197, 90, 40, 85, 70, 40, 43,106, 95, 66,253,221, 87, 91,241,132, 16,  8,  4,
-  4,132,146,128,101,121, 48,250,124,232, 84,215, 80, 88,164,134,178,188,  2,106, 45, 11,101,185, 17,  5,  5, 69,184,116,229, 28,
- 84,234,115,232,219,171,183,162, 54,154,  2,  0,148,214,  8,195,245, 59, 40,251,227, 50,202,242,111, 65,163, 86, 66,163, 86,226,
-214,165,211, 56,158,246, 29,178,182,108, 64,201,245,235, 96,105,206,210,155,  4, 15,205, 13,104,219,135,155,142,137,137,233,184,
-120,241,226,247,155, 52,105,162, 75, 79, 79,239,150,150,150,246, 43,128,158,214, 74,119,123,193, 41,113, 88,216, 44,  0,232,215,
-165, 11,166, 77,155, 86,124,234,202,149,  3, 79,117,232, 16,213, 16,153,223,178,101, 75, 38,  0,146,152,104,209, 50, 19, 19, 19,
- 93,162,107,150, 72,  0,  0, 91,183,110, 69,104,104, 40, 62, 76, 76,196,172, 89,179, 16, 18, 18,242, 88,248, 97,109, 76, 63, 53,
- 53,181,242,  0,128,195,135, 15,135,  3, 24,229, 36,153,167,  2,  2,  3, 59,  8, 40, 10,111,196,196, 64,165,214,160,224,238, 29,
-136, 68, 66,  8,133,150, 67, 36, 18, 65, 34,243, 66,107,185,252,243,158, 67,135, 58,165,177, 95,203,203,195,143, 91,127,173, 60,
-108,152,159,188, 10,243,147, 87, 97,143,226,176,203,223, 59, 52,246,227, 40,  0,184,125,229, 72,230, 80, 11,243, 87,224, 49, 89,
-237,232,194,247, 95,160,248,237, 94, 24,146, 81,130, 78,  1, 66,  8,252,130,192,148, 23, 35,114,111, 49,188,133, 22, 30, 40,112,
- 48, 39,235,230,245,235,101, 95,167,254,167,253,247,255,249, 30, 95,126,251,213,173,175, 86,124, 54,255,253,233, 51, 70, 45, 94,
-178, 24, 50, 95,111, 12,234, 55,  0,167, 78,158,250,254,181,248,215,220,254,102, 27,243,183, 93,239,220,185, 19, 79, 61,245, 84,
-107,  0, 19,156, 53,251,155,205,102,244,234,213,139, 99, 89, 86,168, 86,171, 97, 50,153, 96, 50,153,112,229,202, 21, 40, 20, 10,
- 28, 59,118, 12, 77,154, 52,129,217,108,198,164, 73,147,156,201,235,184,184,184,184, 47,198,142, 29,235,183,118,237, 90, 63, 66,
-136, 24,192, 97,  0,106,  0,189,  0,252,106, 39,120, 30,  4,208,197, 17,189,109,239,191,191,121, 84,247,238,228,167,152, 24, 20,
-158, 61,139,207, 62,251,140,219,181,107,215,255,187,125,251,118,168, 66,161,120,123,238,220,185, 48,155,205, 24, 48, 96,  0,188,
-189,189,251,227,  9,135,189, 48, 80,167,  5, 96,102, 38, 74, 86,162, 36,229,247,235, 37, 25,145, 17,193,209,189,229, 65,150,117,
-196, 95, 88,132,223,125,134,227,224, 31,197,232,223, 57, 16,207,200,119,193,247,183, 37, 61, 71,244,144, 79,216,120,228,210, 31,
- 53, 17,111,210, 54,150,240,124,  1, 63,250,245,153,152, 53,253, 43,  0, 74,  0,190,  0, 76,104,217,190, 23,164, 18, 33, 12, 58,
- 19, 64, 91,  4,  4, 95, 95, 95, 20, 43,107,221, 47, 27,  6,253, 85,  2,128,191,244,251,183,160,168,213, 85,148,  4,206,240, 39,
-140, 38, 51,100, 62, 82, 64,108, 17, 16,180, 26, 13,250,247,239,143, 35,191,254, 84,187, 58,194,209,224, 56, 33, 24,134,129,201,
-100, 66,133, 80,  0, 33, 77,  1,119, 53, 96,188, 24,176, 98, 14,188, 72,  0,189, 64,  8, 70,167,135,202, 84,123,172,147,175,143,
- 14, 12, 67, 96,162, 89,168,212, 26,228, 92,207, 71,193,221, 82, 24,104, 51, 52, 21, 74, 84,104, 85, 48,178, 52,136,144, 64,167,
- 87, 67,163,191,137, 91,133,106,148,105,117,181,210,100,237,164, 52, 70,173, 67,193,185,203,184,119,249, 38, 52,218,235,208,170,
- 84,224, 33,132, 72, 64,192, 19, 17, 40,202, 98,245,117,197,185,246, 65,252,  7, 78,185,  3, 28,224, 30,128,123,243,230,205, 51,
-  0,192,220,185,115, 79, 37, 37, 37,121, 91,179,110,  4,144,239, 46,225, 53,107,214, 44,141,137,137,  1,  0, 68,132,132,132, 90,
-125,226,130,134,236, 28, 54,243,191,213, 18,224,176,248,194,195,195,135,210, 52,141,228,228,100,188,252,242,203, 24, 59,124,248,
- 95,  3,253,133, 11, 22, 75, 80, 72,  8,239,108, 92,192,172,249,243, 43,125,254,  0, 48,123,193,130, 42,150,  1, 39,205,254, 85,
- 96,211,254,109, 76,223,134,212,212, 84, 36, 36, 36,224,192,129, 27, 63,  2,248,201, 17,157,  0,161,240,223, 70,218,  4,129, 64,
-128, 43, 55,114,193,243, 60, 46,229, 92,  3, 77,155, 65,129, 64, 40, 20,130, 16,  2,142,101, 97,208,233,113,237,247,223, 15, 57,
- 81,134,148, 61,211,127,237,229, 81,246, 26, 63,  5,  0, 39,206, 92, 64,219,136,150, 46, 77, 83, 62,144,246,239, 74,109,255,128,
- 69,243,183,185, 66,248,231,199,188, 21,189,119,155,123,214,128,  6,129,242, 46,196, 45,218,161,120,154, 20,146,103,198,129,205,
-222,  7, 86, 99,137, 55, 40,158,246, 52, 90,166,102,129,229,234,110, 42,237,219,182,111,234,229,229,237,245,229, 55,107,140,209,
- 67,134,136,251,246,239,247,211,254, 61,191, 61,127,229,122, 14,192,241,144, 74, 36, 24,208,123,  0,118,239,220,141, 17, 35, 70,
-240,251,246,237,115,122, 40,168,174,245,239,223,191, 31, 55,110,220,160,  1,136, 79,158, 60, 73, 79,157, 58,117,124,106,106,234,
-107,142,232,228,229,229,161,117,235,214,  0, 64,229,229,229,225,252,249,243,104,217,178, 37, 34, 34, 34, 80, 94, 94,142,236,236,
-108,180,106,213, 10,161,161,161,104,217,178, 37,242,242,242,234,110, 40, 20, 21, 31, 23, 23,183,100,240,224,193, 62,167, 78,157,
-242, 99, 24,102,178, 76, 38, 27,109, 48, 24, 86,192,178,245, 57,172,  2,192, 42, 88,182, 86,167, 81,199,244,118,145, 72, 20,159,
- 54, 99,198,250,167, 67, 66, 72,201,156, 57,232,207,113, 88,181,115, 39, 95,168,215,191,133,191,182,101, 95,127,233,210,165,181,
- 12,195,  8,125,124,124, 16, 30, 30,238, 99, 54,155, 33, 18,137,240,119, 67, 77, 46,128, 48,  0,173,199, 68,182,120,183,121,176,
-247,  4,152, 13, 64,251, 97, 56, 19, 50,  6,207, 36,126,  7, 67,169, 10,  2, 63, 95, 40, 86,198, 99, 80,167,223, 17,116, 33, 99,
- 48,128, 22,181,253, 64, 27,191,102,248,227,194, 47,118,  6,  7, 29, 44, 91, 40,155,  1,179,  9, 66, 78,  0,202,202,196,183,109,
-119,188,139,200,190,139, 60, 70,244,236, 82, 77,  9, 21,  2, 16,  1, 34, 41, 24,194,194,170,  7,227,149,  9, 51,  0, 64,145,244,
- 81, 98,173, 29,129,229,120, 48, 28,  5,138, 97, 64,209, 38,232, 41, 75,219, 49,  8,  4,240,102, 12,208, 24,120, 16, 17,  1,203,
-178,208,179, 64,177,174,246,141,159, 24,154,131, 81, 36,  0,167,103,192,112,106,104, 43,204, 16, 16, 17, 76,140, 25, 52, 79,131,
- 49,211,128,152,  3, 69,  0, 34,225,160, 54,176, 40, 42,209, 67,103, 98,106, 84,146, 41,194, 86,238,195, 75,200, 95, 46, 93,179,
-209,  0,181, 82,  9,138,  8, 32, 20,242,  0, 47,132,128,184,175,234, 92,189,117,149,110,223,178,189,216, 25,179,127,109,178, 25,
-236,118,196, 74, 74, 74, 26,  5,224,246,220,185,115,123,250,251,251,  7,168,213,234, 91, 73, 73, 73, 46, 19, 77, 76, 76,124,115,
-205,154, 53,104,220,184,177,253, 61,213,170, 85,171, 14, 60,213,161,195,208, 83, 87,174, 28,108,168,142,144,152,152, 24,109,231,
- 10,168,139,249, 71,245,233,211, 39,124, 96,143, 30, 32,190,190, 72, 74, 74,194,156, 57,115, 32, 18,137, 96, 46, 47,135,191,191,
- 63, 62, 76, 76,172,140, 11, 72,136,139,115, 40,  4, 84,247,241, 59,138,  9,168,203,163, 80, 93,251,119, 96, 29,112,216,100,202,
-149,202, 14, 62,190,190, 40, 45, 47,135,226,196,  9,  8, 41,  1, 76,102, 51,244,  6,  3, 56,142,171, 20, 92, 24, 51, 13,218,100,
-114,198,165,193,  1,160,172,110,  0,206,174,225, 27,173,247, 49, 63,121,149, 24,  0,218,202,229,197, 55,107,214, 45, 92,178, 82,
- 53,107, 29, 25,181,119,219,183,174,152,155,107, 47, 96, 23,204,254, 85,204,178, 91,254,131, 30,175,255,  3,146,136,110,150,177,
-162,244, 46,114,148, 22,193, 95,210,255,  5,228,179, 12,188, 86,215,237,106,214,104, 52,  1, 18,153, 20,109, 34, 34,164, 55, 11,
-110, 55, 41, 43, 41,195, 43,175, 77, 80,236, 57,152,129,149,203,146,211,183,237,217, 25,211, 54,162, 45,226, 95,158,136,172, 51,
-199, 48, 98,248,112,126,223,254,253, 14,191,217, 94,235,223,191,127, 63,134, 13, 27,102, 19, 22,197,119,238,220,193,212,169, 83,
-197,  0,224, 76,108, 65, 89, 89, 25,  6, 13, 26,  4,150,101,145,151,151,135, 99,199,142,161, 83,167, 78,240,247,247, 71,243,230,
-205,209,163, 71, 15, 80, 20,  5,138,162,208,164, 73, 19, 71,237,180, 83,151, 46, 93,190,232,223,191,191,224,194,133, 11,126, 44,
-203, 22,109,221,186, 85, 99, 48, 24,146,  0,216, 59, 77,223,125,254,249,231,243,247,236,217, 19, 65,  8,185,139,218, 55,230,233,
-153, 48,112,224,250,190, 66, 33, 41, 89,178,  4,188,217, 12,133, 64,192,101,233,245,147, 96,217,198,221,134,119,230,205,155, 39,
-164, 40, 10, 74,165, 18, 55,110,220, 40,238,210,165, 75, 40,254,134, 16, 86, 99,254,109,195,252,101,  3,159,239, 30, 62,213, 79,
- 38,234,195,176, 92,185,144,103,253, 16,208, 68,112, 87,101,132,161, 84, 13,136,133, 96, 85, 90, 20,148,211, 64,112, 11, 80, 28,
- 45,173,203,196,123, 93,163, 65,187,  0, 63, 48, 38,224,122,230,143,104, 19,245, 92,165,  2,103,166,205, 16,129, 66,133,209,178,
- 67,237,136,168, 94,144,  5,135, 99,197,250, 95,107,205,240,136,174,  4,123,206,243, 16, 73,  1,113,139,231, 64,231, 31,173,180,
-  2,136,196, 18,152, 97,132,143,204,178, 35,233,206, 61,155,240,199,201,204, 58, 77,146, 28,199, 65, 76, 27, 96,134, 24, 20,197,
-  0, 70,203,192,102, 54,155, 97, 50,138, 32, 16,138,  0, 35,192,115, 22, 23, 65, 75,121,  4,144, 85,243,140,  2,189,145,131, 64,
- 64, 96,102,204, 48,154, 56,104,180,150,118,104,230,120,208, 38, 14, 16,  2,  2,145,  0, 66, 41, 64, 12, 44, 56,194,128,131,  1,
- 90,  3,  0, 56, 30, 88, 88,  0, 20,  7,240,  4,160, 40, 14,132,  8,192,241,  4, 20,101, 85,156, 56, 10, 28, 69,129,112,206, 41,
-200,118, 65,126,226,122,182, 35,111,  0, 33,115,231,206, 45, 78, 74, 74,138,  6,240,210,220,185,115,135, 39, 37, 37,233,  0,148,
-185,101,178,138,141, 21,175, 89,179,230,219,152,152, 24,200, 27, 53,170,188, 47,111,212, 40,192,106,  5,  8,121, 20, 29,134,166,
-105,133,205,247,207,107,181,248,228,147, 79, 96, 42, 43,131, 45,242,173,141, 85, 88, 17,153, 76, 24, 53,106, 84,113, 97,113,241,
-120,103, 52,237,  6,116,201, 84,177,  0,212, 97, 33,192,233,211,167, 73, 77,194, 67, 21,161,214, 68, 67, 69, 43, 97, 52, 26, 17,
-224,239, 15,169, 88,  2, 51,203,128,231,121,176, 44, 11,154,166, 97, 54,155,193, 49,172,179,241, 12,220,181,188, 60,170,173, 92,
-110,211,  8,184,107,121,121,212,143, 91,127,149,218, 91,  4,218,202,229,170,134, 50,223, 23,228,102, 55,152,230,239,110, 12,192,
-144,140, 18, 20,203,211, 33,110,209, 14, 36,162, 27, 90,174, 59,139, 82, 35,  7,111, 33,  1,253,223,237,184,122,227, 38, 28,237,
- 90,108, 96,104,156,206, 58,137, 47, 86,124,142,167,163,  6, 98,222,255, 91,128,223,246,254,134,159, 54,252,128,254,131,  7,198,
- 52,151,183,128,208, 75,132,131, 71, 15, 98,227,247, 63,224,151,237, 91, 33,150, 74,249,157, 59,119,214,185, 62,196,182,109,219,
-170, 48,126, 27, 84, 42,149,203,229,163,213,106,225,239,239,127,  2, 64, 95,185, 92,142,222,189,123, 67, 32,176,184, 89, 91,182,
-108,  9,137, 68,  2,181, 90, 13,185, 92, 14, 95, 95,223, 91, 90,173,182,101, 29,228, 46, 93,184,112, 97,233, 47,191,252, 50,178,
-109,219,182, 29,182,110,221, 90, 81, 94, 94,190, 16,192, 70,123,249,101,200,144, 33,239,175, 91,183,110, 11,128, 98,  0,177,  0,
-126,  7,208,189,  6,122,103, 87, 43, 20, 75,  3,178,179, 63,122,149, 97,240, 57,192,125, 91, 81, 49,177, 26,189,151,102,204,152,
-241,249,148, 41, 83,112,243,230, 77,236,222,189, 27, 12,195, 28,  2,240,234,147,194,212,123,244,232,129,115,231,206, 85,250,253,
-235,180,176, 84,187,110, 53, 38,178,197, 98, 63,153,168, 79,137,198,248,219,241,107, 37, 73, 16, 72,128,171, 71,241,172,156,199,
- 63,167,143, 66,239,206,114,204, 72,120, 30, 47,182,166,129,139,251,193,139,100, 12,234, 12,214, 81, 33, 71,149, 15,161,  4, 24,
-241,226, 63,176,241,203,101, 22,101, 81,111,  2,107,  0,182, 43,206,225,192, 41,203,140,194,102, 45, 34, 64,  9, 29, 51,175,145,
-221,  9,204, 70, 96,231,238,125,136, 28, 62,221,162,253, 67,  4,129, 12,136,123, 33, 22, 35,  7,143,182,116,252, 91,185, 96,140,
-117,111,213,204,243, 60, 24, 98, 97,240, 38,218, 18,252,103, 50, 26,160,215,235, 81, 81, 81,  1,173, 70, 13,173, 86, 11,141,202,
-162,101,189,  0,  0, 32,  0, 73, 68, 65, 84,182,  2,198,138, 10, 24, 12,134,218, 27,127,  5,129,193,200,194, 96,100,161,211,155,
-161,173, 48,161, 92,107,130, 74, 67, 67,173, 53, 67,165,178,156,149,101, 12,148,229, 12,148,106,  6,165, 74, 26,247, 74,107,207,
- 35,197,243, 96,  1, 16,150,128, 80, 28,120,194,  3, 60, 15,158, 23,128,229,254,170, 62,206, 58,122,184,106, 27,239,216,191, 35,
-142,237, 57,134,223, 14,253, 86, 41, 20, 92,189,117,213,213, 54, 23, 14,160,245,242,229,203,207,  3, 88,253,225,135, 31,190,215,
-170, 85, 43, 38, 53, 53,149, 36, 39, 39,187,172,117, 77,137,141, 37,226,176,176,109,  0, 16, 22, 22,118,223,243,105,211,166, 49,
-217, 87,175,110,106,168, 88,  0,155,249,223,217,125,227,109,190,127,  0,216,188,121, 51,174, 23, 21,  1,  0,118,101,102, 86,121,
-118,245,234,213,208,144,144,144,242, 71, 49,  8, 12, 29,218,202, 54,239,186,202,125,219,181,237,185, 35,120,249,249, 94,225, 88,
- 22, 26,101, 57, 74, 75, 75, 81,166, 42,135, 78,175,135, 78,175,135,182,162,  2, 58,181,  6, 90,149, 10, 70,131, 30,180,209,  8,
-142, 97, 29,142, 57,109,229,114,219,152,193,  1,160,237,221,  1,  0,240,227,214, 95, 49, 63,121, 85,  0,128, 48,151, 27, 98,235,
-200,168,234,130, 67, 68,167, 33, 81,143,122, 80,190,251,138, 28, 45,215,157,  5,137,232,  6,211,225,116,220,122,163, 39,188,133,
-  4, 71,135,133,128, 81,151, 32,114, 95, 49,132, 14,154, 95, 70, 70,  6,121,123,230, 59,184,126,245, 42,178, 50,143,194,223,215,
- 31,227, 94, 25,135,128,224, 32,156, 57,153, 13, 31,177, 20,222,222,222,104, 34,111,138, 77, 63,111,194,135, 31,127,132, 10, 55,
-152,184, 13,189,122,245,114,249, 29, 95, 95, 95,168,213,234,190, 20, 69,209,205,155, 55, 71,159, 62,125,208,185,115,103, 52,106,
-212,  8, 82,169, 20,114,185, 28,221,187,119, 71, 64, 64,  0,180, 90,109, 75, 95, 95, 95, 71, 36, 63, 61,124,248,112,198,134, 13,
- 27, 68,229,229,229,243,170, 49,235,216, 65,131,  6,125,177,110,221,186,239,194,194,194,150, 16, 66,124,  0,124,  8,160, 46, 51,
-217,199,139,181,218, 79,223, 98, 24,246, 91,131, 97,124, 53,122, 49,175, 38,252,235,151,233,239,205, 18, 92,189,122, 21, 39, 78,
-156,192,186,117,235, 42,  0,252,243, 73,211,236,171,  7,189,215, 22,  4, 95,125, 16,144,  8, 40,226,155, 95,166,251,105, 83,214,
-205,127,158,187,165, 60,105, 96,201,117,148,222,132,244,151,119,177,100,128, 22,217, 11,251, 96,101,116,  5,188,183, 79,  3,148,
-  5,168,224,165, 23,173,146, 87, 45,248, 43,170,255,252,133, 95,241,175,127,109, 64, 27,191,174,248,243,248,121,236, 87, 92, 70,
-116,255,206, 24, 54,200,210,208,120,129, 16, 52,235,252, 71,142,232,217,  1,139, 63, 93,134,125, 23, 53,240,145,119,194, 11, 47,
-140,194,111,135,182, 97,247,111,155, 44, 31,199,154, 33, 17,213, 61,206,241, 28, 11,150,179,104, 51,176,106, 51, 52, 77,195,104,
- 52,194, 96, 48, 64,167, 55,192,160,215,193,160,215, 65,111, 50,130, 54,213,190,237,115,153,193, 23,234, 10, 22, 26,  3,  7,141,
-129,179,252,175,229, 80,161, 99, 80,161,103, 80,174,100, 81,166, 52,163,172,220,140,178, 50, 51, 74, 75,105,220, 43, 53,215, 41,
-  0,252,101,254,191, 95, 85, 19, 10,120,  8,  8,  1, 95, 45,234,159, 39,142, 21,167, 15,226, 63, 64,199,254, 29, 43,175, 15,172,
- 63, 80,105, 17, 56,182,231, 24,174,222,186,122,211,149,  6,151,158,158,254, 95,158,231,187,196,196,196,196, 71, 68, 68,132,  0,
-160, 56,142,147,152,205,230,192,153, 51,103,250,213, 98, 10,174, 17,226,176,176,249,107,214,172, 25, 25, 19, 19,131,136,144, 16,
-167, 92, 87,245, 52,255, 71,  1, 64,100,135, 14, 14,  3,216,218, 54,110, 28,157,156,156,140, 63,111,221,210,252,178,127, 63,174,
- 92,185, 82,169,245,183,111,223, 30,214,103,244, 47,251,247,227,214,173, 91,184,154,157,109,112, 68,115,214,252,249,152,189, 96,
- 65,165,121,223,246,191,237,218,246,191, 43,177,  0, 73, 73,105,252,144, 33, 67,222,181,103,250,182,115,239,222,189,145,148,148,
-230,148,118,125,237, 74,110, 54,195, 48,160,105, 19,148,247,138, 81,114,183,  8,165, 69,247, 80, 90,116, 15,202,226, 18,168,202,
-202, 96,210,233, 44,241, 51, 42, 21,156,  8,  2,100,230, 39,175, 18,206, 79, 94, 37,  4,160,  1,192,245,237,213,237,190, 68,118,
-113,  1, 78,163,105,235,200,168,194,220,108, 69,247, 62,127,229,161,117,207, 23,163, 84, 37, 55, 20,245,105, 31, 36,174,188,138,
-230,239, 14,114,148, 58,228, 79,126, 10,252,205, 11,  8,253,207, 25,120,175, 61,141,187,175,200,209,123, 95, 49,136, 72,  2, 33,
-  1,132,148, 99,  1,244,194,197,139,228,147,101,139, 49, 99,246,251, 48,115, 44,174,228, 93,195,132,113,227, 33,150, 74,177, 99,
-251, 78,192,204,194,100, 52,225,104,246,113, 24, 12, 21,152, 50,105,210,225,183,223,126,187,174,186, 38, 99,198,140,137, 30, 62,
-124, 56,  8, 33,200,200,200,184,207,164,255,193,  7, 31, 56,253,157,193,193,193,184,115,231, 14,  0,  8, 83, 82, 82, 80, 82, 82,
-130,174, 93,187, 34, 32, 32,  0, 20, 69,225,228,201,147,160, 40, 10,132, 16,220,185,115,  7,193,193,193,206,144, 93, 66,211,244,
- 96,  0,155,237,238,141, 27, 52,104, 80,242,228,201,147,  3, 83, 82, 82,164,132, 16, 10,192, 54, 88,102,  1,220,115, 64,111,206,
-  9,179, 57,178, 58,189, 87,231,254,178,229,229,241,211,200,200,119, 82,144,121,226, 18,146,147,147, 57,141, 70,243, 38, 44,179,
- 11,158, 56,244,232,209,163,242,112,202,  5,  0, 32,119,211,241,155,137, 74,157,233, 52,128, 28,  0, 77,178,174,149,124, 61,184,
- 67,216,199,194,155, 39,130,176,110, 34, 32,241,  6, 76, 58,128,231, 97, 22, 72,239, 29,253,243,238,183,168, 99,245,165,141, 63,
-125, 21, 61,126, 66,188,  2,  0,116,156, 25,215, 85,249,  0, 88,180,241,139, 64,116,116, 55,132, 53,106,140, 50,181,198, 98, 43,
-160, 25,220, 85,233,234,252,168,102, 45,250,163, 32,223, 58,205,147,  8, 49,162,187, 37,  6, 96,223, 69, 51,126,219,149,142,123,
-165,119, 16, 28, 96,153, 73, 16, 32, 22,161, 91,100, 15, 40,182,215, 97,210,133, 16, 98,142,  1, 11,  1, 56, 66, 64,177, 28, 96,
-102,192,138,132,  0,161, 96,235,147, 28, 15,203, 90,  1,117, 96,175,226, 38,121,126,160, 47,239, 37,230, 33, 20,217, 89, 24,204,
-  0,195,  3, 70, 26, 96, 77, 44,  8, 33, 32, 98,  2,134,  5,116, 38,224,100,150,154,244,232,209,156,175,209,228,111,227,150, 20,
-  7, 98, 53,255, 91,132,  2,  2,150,163, 64,  9,172, 51,  5,  0,240,  2, 30,224,157,179,  2,216, 51,255,154,174,143,237, 57, 22,
-225,108, 67,139,137,137,233,156,158,158,254, 57,128, 30,233,233,233,251,210,211,211,143,198,196,196, 36,182,110,221,218, 76,  8,
-  9, 94,185,114,229,254, 15, 63,252,112,194,178,101,203, 14,215, 33,124,218,180,127,225,236,217,179,231,207,158, 61, 27,251,246,
-237,131,238,222,253,125, 57, 34, 36,  4, 55,111,222,  4,  0,133, 51, 11,249,212,182,232, 79, 98, 98, 98,212,154, 53,107, 20,171,
- 87,175, 70,100,251,246,209,167, 46, 95,118,104, 42, 62,126,241, 98,230,128,255,207,222,151,199, 53,121,108,239, 63,147,141,  0,
- 42,130,187,104, 85,172,168, 85,235,130, 21, 80, 43,137,162,181, 90,187,252,106,212,234,181,245,171, 45, 65,237,117,235,130,182,
-182,118,209,170,189, 23,181,171,196, 46, 87,187, 88, 37, 88, 91,183,186,160,  9, 42, 34,136, 86,235, 10,  8, 42,130, 11, 74,194,
-150,  0,217,230,247, 71,242,198, 16,  3,121, 19, 80,180,125,159,207, 39, 31,222, 45,135,201,204,188,243,156,115,230,204,153,190,
-125,159,186,112,236, 88,103,  0, 62,  0, 62, 55,250,248, 64, 88, 93,141,110,237,218, 97,193,130,  5, 72, 77, 77, 93, 25, 26, 26,
-154,146,154,154,186,191,160,160,192,141,114,119,119, 30,128,122,196,  0,212,208,  3, 83, 82, 82, 72, 92,156,236,216,209,163, 69,
-169,114,185, 92,  4,  0,113,113,178,193, 43, 87, 42,211,192, 50,  9, 80,231,190,143,189, 83,121,253,198, 40,139,201,220, 67, 87,
- 90,138,210,219,183, 64,  8, 15,148, 90, 80, 85, 85,  5, 74, 41, 40,165,184,116,238, 60,140,134,106,252,153,156,236,174, 14, 29,
-199,156,230,  0,120, 99,164, 81,150, 49,210, 40, 56, 46, 11,180, 77, 17,176, 70,135,110,131, 36,  5, 57, 25, 42,  0,232,220,169,
- 19, 78,101, 88,245,228,220, 63,183,  1,  0, 90, 61, 50, 64,122, 43,255, 68,163, 13,198,  3,255, 40, 66,230,211, 64,191,176,104,
- 20,205, 30,140,182, 95, 31, 65,182, 70,135, 64, 17, 65,177, 70, 11,  1, 33,110, 61,  0,246,119, 51, 53,181,198,147, 93,187,118,
-165, 99,198, 62,141, 29,219,118, 32, 49, 49, 17, 31,188,251, 30,246,170,247,131, 47,224, 35,184, 67,112, 84,105,105,221, 75,151,
-183,110,221,170,182, 41,  2,146, 81,163, 70,213,136,  5,216,183,111, 31, 46, 94,188, 88,165, 80, 40,218, 57,123,147, 92,246,151,
-206,157,145,151,151,135,199, 30,123,204, 52,111,222, 60,209,166, 77,155, 16, 16, 16,128, 11, 23, 46,220,229,121,205,203,203, 67,
-103,246,237,236,152,120,110,234, 19, 79, 60,241,209, 75, 47,189, 20,144,153,153,217,180,170,170,234,255,124,125,125,159,177,  5,
-  6,254,206, 82,158,227, 66,249,169,207,252,123,211,134,161, 35, 94, 32,159, 38,  3,164,253,179,248,100,205, 59, 84,147,115, 97,
- 58,  0, 37,254,198,168,161,  0,204, 85,227,236,103,146,234,236,185,106,251,148,102,254,103,146,146, 63,202,171, 76,186,240, 71,
- 91,142,  9,242,227, 63,193,175,174,242, 55, 81, 94,121,113,185,225,104,218,197, 27,123, 10, 53,250,148,185,106, 92,175, 77,201,
-152,242,175,197,234,131, 71,210,164,  0, 84, 22, 62, 51,205,199,199,197,178,235,120,255,245,233,208,235,171, 81, 86,105,141,  1,
- 48,240,124,176,121,107,221,105,118, 11,242,211,200, 11,207,254,219, 74,150,102,198,114, 54, 97,116, 31,130, 73,179, 86,193,207,
-207,  7,205,124,197, 82,  0,170,156, 51, 39,164,235,191,216, 90,231,128, 36,160, 38, 24,136, 85,  9,  0, 33, 48, 83,106, 85,  4,
- 76,182,229,126,132,  7,129,197,  2,147, 45, 56,208,157, 18, 80, 82,217, 28,149,213,197, 16,  9,120,246, 52,103, 38, 11, 96, 52,
- 82, 24, 77, 20, 21,149, 22, 16, 62,129, 25,  4, 70,203, 29,215,189, 43,152, 45, 60,240,136, 25,196, 76, 64,121,212,238,254, 39,
-181, 24,207,140,164,179, 23, 54, 17,119,185,161,207,167,157,175,111,223,177,187, 45,250,244,233,115, 61, 36, 36,228,133,203,151,
- 47,119, 75, 76, 76,204,  0,240, 92, 82, 82,210,115,142, 15,175, 88,177, 66,189,112,225, 66,233,138, 21, 43,220, 17,132,189, 66,
- 98, 99, 99,107,125,232,197, 87, 94,177,250,  0, 61, 75, 12, 68,157,220,254,  0,128, 65, 61,123, 74, 51, 88,144,191,125,  0, 62,
-117,202, 30,173, 58,184, 79, 31, 75,124,124,252,151,227,198,141, 51,101,101,101,  9,174, 92,185,130,206, 45, 90,164,237,216,177,
-131, 85,128,226, 61,202,  3,224, 72,238, 55, 83, 82, 82, 28, 99, 60, 78, 59,212,179, 91, 37, 64,185, 98,165, 78,182, 48,238,197,
- 11,251, 15,164, 53,247,247,111, 86,166, 45,129,201,100,  2,181,189,  7,218,155, 69, 40,211,106, 65, 41, 69,255,232,104,233,159,
-201,110,243, 32,153,112, 39,230,132,103, 91, 14,200, 11, 31,240, 56,198, 72,163,236,171,  0,114, 46, 95,102,173,  4, 68,143,125,
- 73,146,188,243, 23,187,149,255,187,242, 59, 21,  0,180, 10, 25, 34,189,149,151,170,  6,128,198, 33,127,122,183, 18,128,111,208,
- 47,246,125,220,176, 88,208,119,125,  6, 50, 70,183, 65,175, 29, 55, 33, 32, 64, 83,161,119,123,179,237,216,177,131, 76,124,105,
- 34, 29, 62,114,  4,182,109,249, 13, 31,175, 92,129,184,210, 82, 80,139,  5,155, 55,111, 65, 97, 97,225, 51,  0,118,184,147,227,
- 74, 17,  0,128, 23, 94,120,225, 36,128,114, 54,101, 89,191,126, 61, 25, 53,106, 20, 61,113,226,132,104,192,128,  1, 24, 49, 98,
-  4, 84, 42, 21, 30,121,228, 17, 84, 87, 87, 35, 42, 42, 10,148, 82,203,137, 19, 39,120, 66,161,208,155,140,128,143,  5,  4,  4,
-172,158, 56,113,162,240,220,185,115,205,170,171,171,107, 11, 12,100,139,254,193,253, 38,108,232, 55,108, 34,249, 46,  5, 40,171,
-  4, 12,151,118, 91, 52, 57,170,105,168, 25, 24,248,208,128,201,  3,224,104,249,187,186,230,210,149,234, 64,254,204,249,249,207,
- 36, 21,249, 87,110, 87,164,  1,104,103,123,121,171,  1, 20,  2,200,155,171,134, 91, 23,167,226,235,157,234,161, 67,251, 72,205,
-180,137,202,241,229,168,208,149, 89,215,253,243,252,144, 91, 14,178,230,235,141,172,126,224,214,109, 95,144, 91,154, 60,  9,120,
-122,149, 35, 23, 54,105, 18,  0,179, 81, 11, 80, 29, 70,247, 97, 55,161,107,  4, 31,160,212, 74,212,224, 67, 68,109,138,128,141,
-252,173, 57,  0,  1,152,217,205, 77,164, 29,191, 74,194,122,183,163, 38,163,  6,  2,219,194, 94, 74, 41,204, 38,138, 42, 35, 80,
- 86,110,130, 17, 20, 38,202,131, 64, 72,112,251,166,177,214,114, 30, 59,182,146,  0,192,224,200,183, 40, 49, 90,173,127, 10,128,
- 82,  2, 80,155,197, 64,249, 32,124, 11, 44, 22,  1,178,115,182,176,250,205,175,126,252,170,244,114,238,229,186,  8, 88,  8,235,
- 82,141,186,216,201, 94,243, 75,150, 44, 97,252,163,167,108, 86,241, 29,162,126,241, 69,201,150, 45, 91, 84, 54, 37, 64,229, 78,
-  9, 88,167, 84, 26,255, 60,125, 90,214,185, 79, 31,243, 19, 61,122,232,108,125,180,218,230, 16,177, 67, 54,122,180,213,226,232,
-211,199,253,116,199, 91,111, 73,  1, 96, 96,247,238,119,221,203,204,202, 82,103,156,247, 94, 25,234,211,179,231,215, 60, 30,207,
-124,225,216, 49,255, 54,109,218,220, 78, 45, 40,216,224,206,234,191, 15,172,227,216, 15,116,182,128, 63,102,106,160,194,169,173,
-217, 40,  1,231,100, 11,227,194,183,125,251,221,150,144, 46,157, 31,171,174,174,130,217,104,130,197, 98, 65,211,192, 64,148,106,
- 52, 12,249,179, 81,162, 74, 62,124,227,223,173,  1, 24,114, 46, 95, 22, 49,243,255,233, 39,254,194, 24,105,148,101, 73,252, 23,
-238,146,  3,217, 49,107, 78, 28,189,144,117, 65,234, 72,254,  0, 48,252,169,231,164,  7,246,252,174,190,149,151,234,125, 37,214,
- 18,224,231,250, 58,123, 14, 27,248, 71, 17,240,199,235,246,243, 71,127,191, 97, 63, 46, 53,154,189, 46,239,230, 95, 54,147, 33,
- 67,134, 60, 61,106,236,232, 93,175, 77,157,113,248,241,190,125,134,110,251,125, 59,210, 78, 30,199,241,227,199,119,214,229,  6,
-174, 67, 17,152,177,117,235,214,111,183,110,221, 26,177,117,235, 86,214,133, 27, 53,106,212,240,189,123,247, 30,216,177, 99,  7,
- 66, 66, 66, 48,114,228, 72,  4,  4,  4,100,151,150,150,134,158, 61,123, 22,121,121,121, 60,161, 80,136, 81,163, 70, 69,239,221,
-187,215,211,159,122,174,180,180,116,229,246,237,219,235, 10, 12,244,  4,127, 22,158, 76, 92,254, 91,210,179,239, 84,  6, 79, 65,
-229,177,197,150,107,135,150, 77,173,135,188,  7, 78, 17, 96,237,  1,168, 13,115,213,208,  1,248,203,246,241, 10,135, 15,159, 86,
-199,198, 46,148, 38, 40, 62, 86,  5,119,234,  6,160, 26, 66, 31, 49, 10,174,151, 97,227,142, 84,226,185,188,157,234,105,175,206,
-199,250,239,127,  5, 44, 87,  0,  8, 96,170,170, 68,112,187,  0,233,178,183,102,176,182,230, 96,182, 64,192,179,192, 72,  4, 16,
- 82,211, 29, 69,  0, 38,128,154,193, 54, 48,204, 17,199,207, 92, 39,  0,208, 54,136, 71,133,  2,171,181,111,178, 88, 19, 24,149,
-148, 83,152, 77,  0, 95, 96,129,217,196,110,228, 56,146,246, 31,  2,  0,225,131, 22, 80, 48, 57,225,121,128,133, 88,221,253, 89,
- 57,219, 61, 42,228,183,239,125,171,110,128,254,197,202, 92, 97,200,223,193, 19,224,118, 57,214,177, 11, 23,146,142, 57,185, 12,
-235,120,214,237, 51, 13,153, 58,248, 46,229,214,186,196, 47,193,106, 91,123,183,111, 72,  3,231,  1,112,174, 91,157,155,165, 86,
-172,250,142,114,197,202, 11,178,133,113,189,  1,240, 47,164,164, 24,171,244,149,176,152,205,232, 25, 22, 38,109, 23,250, 24,142,
-253,177,157, 93, 29, 83, 50,113,207, 31, 59,237,167,131, 31, 11,177, 31,239,249, 99,231, 93,231,117,133,198,127,253,185, 85, 65,
- 30,241,212,243,210,115, 23,114,113,253,202,105, 21,  0, 28,216,243,187,170,205, 35,189,165, 55,243,207,120,220,238, 19, 38, 76,
-128,167,233,125,205,196,167,206,251,249, 47,180,197, 31,215,170,238,249,128,159,154,154,250,135, 66,161,224,101,102,102, 90,246,
- 31, 77, 65,139,150, 45,156, 87,122,120,132,173, 91,183,126,167, 80, 40,126,144,203,229, 70, 79,190,247,230,155,111,170,  0,144,
-105,211,166,209,220,220, 92,100,100,100,160,188,188, 60,180,105,211,166,104,209,162,133,125, 47,  0, 47,200,159,193,127, 82, 82,
- 82,132,105,105,105,125, 12,  6,195, 98,212,156,203,247,  6,239,158,217,252, 47, 97, 64,215, 31, 22,148,230,238,157,210,  0,242,
- 26, 21,204, 42,  0, 87,215,189, 82,  0,220, 14,130, 10,133, 96,237,218,181,238, 93, 85,123,142,168, 59,116, 30, 65,110, 22,164,
-209,214,193, 29,161, 41, 55, 97,227,182,195, 94,119,208,245,223,174,182,125,183, 13,  5,110, 34,176,169,  0,203, 22,189,230,209,
- 75,255,205,209,156,123,182,129,205, 13,141,133,  0,128,216, 87, 72, 13,149, 70, 88,  0,248,249,249, 65,111,210, 19,179,201,115,
-121,233, 25,214, 61,  3,194,159,152, 79, 45,148,143,203,151,118, 53,230,238,102,108,151, 14,114,187,  4,178,168, 31, 71,194,111,
-224,105,  1, 67, 92,156,204,  7,128,121,229, 74,165,185, 62,130,148, 43, 86, 50, 27,249,216,219, 52,247,140,103,235,244,231, 44,
-255,194, 43,101,204,121, 43, 96, 71,236,223,243,155,218,185,175,221,204,247, 46,127,128,187,141,125,156,117, 96, 19,241, 65, 37,
-175,238, 21,169,185,229, 38,132, 54, 21,220,151,